diff --git a/blackjack/data/Makefile.am b/blackjack/data/Makefile.am
index 94a0173..0bbfa61 100644
--- a/blackjack/data/Makefile.am
+++ b/blackjack/data/Makefile.am
@@ -4,9 +4,9 @@ rules_DATA    = Ameristar.rules		\
 		Vegas_Downtown.rules	\
 		Vegas_Strip.rules
 
-sysdir = $(datadir)/applications/
-sys_in_files = blackjack.desktop.in
-sys_DATA = $(sys_in_files:.desktop.in=.desktop)
+sysdir = $(datadir)/applications
+sys_in_files = blackjack.desktop.in.in
+sys_DATA = $(sys_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
diff --git a/blackjack/data/blackjack.desktop.in b/blackjack/data/blackjack.desktop.in.in
similarity index 90%
rename from blackjack/data/blackjack.desktop.in
rename to blackjack/data/blackjack.desktop.in.in
index b6f4075..e2a3c31 100644
--- a/blackjack/data/blackjack.desktop.in
+++ b/blackjack/data/blackjack.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;CardGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=blackjack
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/configure.in b/configure.in
index b22980c..36d7e19 100644
--- a/configure.in
+++ b/configure.in
@@ -784,6 +784,19 @@ gnome-sudoku/data/Makefile
 gnome-sudoku/images/Makefile
 gnome-sudoku/glade/Makefile
 gnome-sudoku/help/Makefile
+same-gnome/same-gnome.desktop.in
+gnometris/gnometris.desktop.in
+gnobots2/gnobots2.desktop.in
+gnibbles/gnibbles.desktop.in
+gnotski/gnotski.desktop.in
+glchess/glchess.desktop.in
+mahjongg/mahjongg.desktop.in
+blackjack/data/blackjack.desktop.in
+gtali/gtali.desktop.in
+gnome-sudoku/gnome-sudoku.desktop.in
+iagno/iagno.desktop.in
+gnect/data/gnect.desktop.in
+gnomine/gnomine.desktop.in
 tests/Makefile
 tests/libgames-support/Makefile
 ])
diff --git a/glchess/Makefile.am b/glchess/Makefile.am
index 1c2b748..153b736 100644
--- a/glchess/Makefile.am
+++ b/glchess/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS =  data glade help src textures
 
 desktopdir = $(datadir)/applications
-desktop_in_files = glchess.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = glchess.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 EXTRA_DIST = $(desktop_in_files)
 CLEANFILES = $(desktop_DATA)
 
diff --git a/glchess/glchess.desktop.in b/glchess/glchess.desktop.in.in
similarity index 86%
rename from glchess/glchess.desktop.in
rename to glchess/glchess.desktop.in.in
index 9a9ed79..85cd8a1 100644
--- a/glchess/glchess.desktop.in
+++ b/glchess/glchess.desktop.in.in
@@ -11,8 +11,7 @@ StartupNotify=true
 Icon=gnome-glchess
 MimeType=application/x-chess-pgn;
 GenericName=3D Chess Game
-GenericName[pt_BR]=Jogo de Xadrez 3D
-GenericName[de]=3D Schach
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=glchess
+X-GNOME-Bugzilla-Version=@VERSION@
diff --git a/gnect/data/Makefile.am b/gnect/data/Makefile.am
index 13671b9..77c0129 100644
--- a/gnect/data/Makefile.am
+++ b/gnect/data/Makefile.am
@@ -1,9 +1,9 @@
 velenadir      = $(datadir)/gnect
 velena_DATA    = white_ob.cn4.gz
 
-Games_in_files = gnect.desktop.in
+Games_in_files = gnect.desktop.in.in
 Gamesdir       = $(datadir)/applications
-Games_DATA     = $(Games_in_files:.desktop.in=.desktop)
+Games_DATA     = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
@@ -40,5 +40,3 @@ ggzroomdir = ${prefix}/etc/ggzd/rooms/
 ggzgame_DATA = gnect-server.dsc
 ggzgamedir = ${prefix}/etc/ggzd/games/
 endif
-
-
diff --git a/gnect/data/gnect.desktop.in b/gnect/data/gnect.desktop.in.in
similarity index 90%
rename from gnect/data/gnect.desktop.in
rename to gnect/data/gnect.desktop.in.in
index 9880b9a..219ae52 100644
--- a/gnect/data/gnect.desktop.in
+++ b/gnect/data/gnect.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;LogicGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnect
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gnibbles/Makefile.am b/gnibbles/Makefile.am
index fbc17ca..58a834b 100644
--- a/gnibbles/Makefile.am
+++ b/gnibbles/Makefile.am
@@ -94,8 +94,8 @@ config_DATA = \
 	level025.gnl \
 	level026.gnl
 
-Games_in_files = gnibbles.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gnibbles.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
diff --git a/gnibbles/gnibbles.desktop.in b/gnibbles/gnibbles.desktop.in.in
similarity index 90%
rename from gnibbles/gnibbles.desktop.in
rename to gnibbles/gnibbles.desktop.in.in
index e889a16..0eb80b6 100644
--- a/gnibbles/gnibbles.desktop.in
+++ b/gnibbles/gnibbles.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;ArcadeGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnibbles
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gnobots2/Makefile.am b/gnobots2/Makefile.am
index d46ac20..ebdf287 100644
--- a/gnobots2/Makefile.am
+++ b/gnobots2/Makefile.am
@@ -1,4 +1,3 @@
-
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
 schema_in_files = gnobots2.schemas.in
 schema_DATA = $(schema_in_files:.schemas.in=.schemas)
@@ -62,8 +61,8 @@ config_DATA = robots2.cfg \
               robots_with_safe_teleport.cfg \
               nightmare.cfg
 
-Games_in_files = gnobots2.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gnobots2.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = AUTHORS \
diff --git a/gnobots2/gnobots2.desktop.in b/gnobots2/gnobots2.desktop.in.in
similarity index 90%
rename from gnobots2/gnobots2.desktop.in
rename to gnobots2/gnobots2.desktop.in.in
index f190b3b..26f62cd 100644
--- a/gnobots2/gnobots2.desktop.in
+++ b/gnobots2/gnobots2.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;ArcadeGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnobots2
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gnome-sudoku/Makefile.am b/gnome-sudoku/Makefile.am
index 7f320e1..4dae4e1 100644
--- a/gnome-sudoku/Makefile.am
+++ b/gnome-sudoku/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS =  data glade images help src
 @INTLTOOL_DESKTOP_RULE@
 
 desktopdir = $(datadir)/applications
-desktop_in_files = gnome-sudoku.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = gnome-sudoku.desktop.in.in
+desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
 EXTRA_DIST = $(desktop_in_files)
 CLEANFILES = $(desktop_DATA)
diff --git a/gnome-sudoku/gnome-sudoku.desktop.in b/gnome-sudoku/gnome-sudoku.desktop.in.in
similarity index 85%
rename from gnome-sudoku/gnome-sudoku.desktop.in
rename to gnome-sudoku/gnome-sudoku.desktop.in.in
index 050d1a1..2f3d7c8 100644
--- a/gnome-sudoku/gnome-sudoku.desktop.in
+++ b/gnome-sudoku/gnome-sudoku.desktop.in.in
@@ -9,9 +9,7 @@ Type=Application
 Categories=GNOME;Game;LogicGame;
 StartupNotify=true
 Icon=gnome-sudoku
-Name[en_GB]=Sudoku
-Name[en_US]=Sudoku
-Name[es_ES]=Sudoku
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
+X-GNOME-Bugzilla-Version=@VERSION@
 X-GNOME-Bugzilla-Component=gnome-sudoku
diff --git a/gnometris/Makefile.am b/gnometris/Makefile.am
index e077249..d8e394c 100644
--- a/gnometris/Makefile.am
+++ b/gnometris/Makefile.am
@@ -41,8 +41,8 @@ gnometris_LDADD=\
 	$(INTLLIBS)
 
 
-Games_in_files = gnometris.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gnometris.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
diff --git a/gnometris/gnometris.desktop.in b/gnometris/gnometris.desktop.in.in
similarity index 90%
rename from gnometris/gnometris.desktop.in
rename to gnometris/gnometris.desktop.in.in
index 7627292..4dcf975 100644
--- a/gnometris/gnometris.desktop.in
+++ b/gnometris/gnometris.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;BlocksGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnometris
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gnomine/Makefile.am b/gnomine/Makefile.am
index 65a9eae..0e42427 100644
--- a/gnomine/Makefile.am
+++ b/gnomine/Makefile.am
@@ -1,6 +1,3 @@
-
-
-
 Gamesdir = $(datadir)/applications
 
 SUBDIRS = help
@@ -36,8 +33,8 @@ pixmap_DATA = face-cool.png face-sad.png face-smile.png face-win.png 	\
 EXTRA_DIST = gnomine.desktop.in README AUTHORS \
 	$(schema_in_files) $(pixmap_DATA)
 
-Games_in_files = gnomine.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gnomine.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 SCOREFILES = Small Medium Large Custom
diff --git a/gnomine/gnomine.desktop.in b/gnomine/gnomine.desktop.in.in
similarity index 90%
rename from gnomine/gnomine.desktop.in
rename to gnomine/gnomine.desktop.in.in
index b5a808a..18a1400 100644
--- a/gnomine/gnomine.desktop.in
+++ b/gnomine/gnomine.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;LogicGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnomine
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gnotski/Makefile.am b/gnotski/Makefile.am
index 236e29b..ad89fcf 100644
--- a/gnotski/Makefile.am
+++ b/gnotski/Makefile.am
@@ -1,6 +1,3 @@
-
-
-
 pixmapdir=$(datadir)/pixmaps
 Gamesdir=$(datadir)/applications
 
@@ -29,8 +26,8 @@ gnotski_LDADD = \
 
 pixmap_DATA = gnotski.svg
 
-Games_in_files = gnotski.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gnotski.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = README $(Games_in_files) $(pixmap_DATA) $(schema_in_files)
diff --git a/gnotski/gnotski.desktop.in b/gnotski/gnotski.desktop.in.in
similarity index 90%
rename from gnotski/gnotski.desktop.in
rename to gnotski/gnotski.desktop.in.in
index 8f3964a..c7c8406 100644
--- a/gnotski/gnotski.desktop.in
+++ b/gnotski/gnotski.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;LogicGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gnotski
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/gtali/Makefile.am b/gtali/Makefile.am
index e03d3cb..70e9fb7 100644
--- a/gtali/Makefile.am
+++ b/gtali/Makefile.am
@@ -1,8 +1,5 @@
 Gamesdir = $(datadir)/applications
 
-
-
-
 SUBDIRS = pix help
 
 INCLUDES =						\
@@ -36,8 +33,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 EXTRA_DIST = gtali.desktop.in README AUTHORS $(schema_in_files)
 
-Games_in_files = gtali.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = gtali.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 install-data-local:
diff --git a/gtali/gtali.desktop.in b/gtali/gtali.desktop.in.in
similarity index 90%
rename from gtali/gtali.desktop.in
rename to gtali/gtali.desktop.in.in
index 0adc8a4..b92a76a 100644
--- a/gtali/gtali.desktop.in
+++ b/gtali/gtali.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=gtali
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/iagno/Makefile.am b/iagno/Makefile.am
index 9b707d6..c98ac16 100644
--- a/iagno/Makefile.am
+++ b/iagno/Makefile.am
@@ -54,8 +54,8 @@ pixmap_DATA = \
 	classic.png \
 	woodtrim.png
 
-Games_in_files = iagno.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = iagno.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 schemadir   = @GCONF_SCHEMA_FILE_DIR@
diff --git a/iagno/iagno.desktop.in b/iagno/iagno.desktop.in.in
similarity index 90%
rename from iagno/iagno.desktop.in
rename to iagno/iagno.desktop.in.in
index e89e2c0..cd8484e 100644
--- a/iagno/iagno.desktop.in
+++ b/iagno/iagno.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=iagno
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/mahjongg/Makefile.am b/mahjongg/Makefile.am
index d40e8fe..a683fe1 100644
--- a/mahjongg/Makefile.am
+++ b/mahjongg/Makefile.am
@@ -1,6 +1,3 @@
-
-
-
 mapdir = $(datadir)/gnome-games/mahjongg/maps
 pixmapdir = $(datadir)/pixmaps/mahjongg
 Gamesdir = $(datadir)/applications
@@ -44,8 +41,8 @@ pixmap_DATA = smooth.png postmodern.svg
 EXTRA_DIST = mahjongg.desktop.in $(pixmap_DATA) \
 	$(schema_in_files) $(map_DATA)
 
-Games_in_files = mahjongg.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = mahjongg.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 SUBDIRS = help
diff --git a/mahjongg/mahjongg.desktop.in b/mahjongg/mahjongg.desktop.in.in
similarity index 91%
rename from mahjongg/mahjongg.desktop.in
rename to mahjongg/mahjongg.desktop.in.in
index ced0842..ae2ded1 100644
--- a/mahjongg/mahjongg.desktop.in
+++ b/mahjongg/mahjongg.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;BoardGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=mahjongg
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1ee5a2b..ba9fdcc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -93,7 +93,7 @@ aisleriot/rules/will_o_the_wisp.scm
 aisleriot/rules/yield.scm
 aisleriot/rules/yukon.scm
 aisleriot/rules/zebra.scm
-blackjack/data/blackjack.desktop.in
+blackjack/data/blackjack.desktop.in.in
 blackjack/data/blackjack.schemas.in
 blackjack/src/blackjack.cpp
 blackjack/src/card.cpp
@@ -135,7 +135,7 @@ glchess/glade/network_game.glade
 glchess/glade/load_game.glade
 glchess/glade/glchess.glade
 glchess/glade/new_game.glade
-glchess/glchess.desktop.in
+glchess/glchess.desktop.in.in
 glchess/src/lib/__init__.py
 glchess/src/lib/ai.py
 glchess/src/lib/cecp.py
@@ -174,7 +174,7 @@ glines/glines.c
 glines/glines.h
 glines/glines.desktop.in.in
 glines/glines.schemas.in
-gnect/data/gnect.desktop.in
+gnect/data/gnect.desktop.in.in
 gnect/data/gnect.schemas.in
 gnect/src/connectx_client.c
 gnect/src/gfx.c
@@ -185,7 +185,7 @@ gnect/src/server.c
 gnect/src/theme.c
 gnibbles/ggz-network.c
 gnibbles/gnibbles.c
-gnibbles/gnibbles.desktop.in
+gnibbles/gnibbles.desktop.in.in
 gnibbles/gnibbles.schemas.in
 gnibbles/main.c
 gnibbles/preferences.c
@@ -193,21 +193,21 @@ gnibbles/scoreboard.c
 gnibbles/server.c
 gnobots2/game.c
 gnobots2/gnobots.c
-gnobots2/gnobots2.desktop.in
+gnobots2/gnobots2.desktop.in.in
 gnobots2/gnobots2.schemas.in
 gnobots2/graphics.c
 gnobots2/menu.c
 gnobots2/properties.c
 gnobots2/statusbar.c
 gnometris/field.cpp
-gnometris/gnometris.desktop.in
+gnometris/gnometris.desktop.in.in
 gnometris/gnometris.schemas.in
 gnometris/main.cpp
 gnometris/renderer.cpp
 gnometris/scoreframe.cpp
 gnometris/tetris.cpp
 gnometris/highscores.cpp
-gnome-sudoku/gnome-sudoku.desktop.in
+gnome-sudoku/gnome-sudoku.desktop.in.in
 gnome-sudoku/glade/high_scores.glade
 gnome-sudoku/glade/new_game.glade
 gnome-sudoku/glade/open_game.glade
@@ -236,23 +236,23 @@ gnome-sudoku/src/lib/gsudoku.py
 gnome-sudoku/src/lib/gnome_sudoku.py
 gnome-sudoku/src/lib/__init__.py
 gnomine/gnomine.c
-gnomine/gnomine.desktop.in
+gnomine/gnomine.desktop.in.in
 gnomine/gnomine.schemas.in
 gnomine/minefield.c
 gnotravex/gnotravex.c
 gnotravex/gnotravex.desktop.in.in
 gnotravex/gnotravex.schemas.in
 gnotski/gnotski.c
-gnotski/gnotski.desktop.in
+gnotski/gnotski.desktop.in.in
 gnotski/gnotski.schemas.in
 gtali/clist.c
-gtali/gtali.desktop.in
+gtali/gtali.desktop.in.in
 gtali/gtali.schemas.in
 gtali/gyahtzee.c
 gtali/setup.c
 gtali/yahtzee.c
 iagno/gnothello.c
-iagno/iagno.desktop.in
+iagno/iagno.desktop.in.in
 iagno/iagno.schemas.in
 iagno/ggz-network.c
 iagno/othello.c
@@ -271,13 +271,13 @@ libgames-support/games-sound.c
 libgames-support/games-stock.c
 mahjongg/drawing.c
 mahjongg/mahjongg.c
-mahjongg/mahjongg.desktop.in
+mahjongg/mahjongg.desktop.in.in
 mahjongg/mahjongg.schemas.in
 mahjongg/maps.c
 mahjongg/translatable_game_names.h
 same-gnome/game.c
 same-gnome/same-gnome.c
-same-gnome/same-gnome.desktop.in
+same-gnome/same-gnome.desktop.in.in
 same-gnome/same-gnome.schemas.in
 same-gnome/ui.c
 same-gnome/drawing.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e4f2750..cbc5f7f 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,7 +1,19 @@
 aisleriot/freecell.desktop.in
 aisleriot/sol.desktop.in
-glines/glines.desktop.in
-gnotravex/gnotravex.desktop.in
+blackjack/data/blackjack.desktop.in
+glchess/glchess.desktop.in
 glchess/src/lib/defaults.py
+glines/glines.desktop.in
+gnect/data/gnect.desktop.in
+gnibbles/gnibbles.desktop.in
+gnobots2/gnobots2.desktop.in
+gnome-sudoku/gnome-sudoku.desktop.in
 gnome-sudoku/src/lib/defaults.py
-
+gnometris/gnometris.desktop.in
+gnomine/gnomine.desktop.in
+gnotravex/gnotravex.desktop.in
+gnotski/gnotski.desktop.in
+gtali/gtali.desktop.in
+iagno/iagno.desktop.in
+mahjongg/mahjongg.desktop.in
+same-gnome/same-gnome.desktop.in
diff --git a/same-gnome/Makefile.am b/same-gnome/Makefile.am
index 7221b80..9ea725d 100644
--- a/same-gnome/Makefile.am
+++ b/same-gnome/Makefile.am
@@ -1,6 +1,3 @@
-
-
-
 pixmapdir = $(datadir)/gnome-games/same-gnome/themes/2.10
 Gamesdir = $(datadir)/applications
 
@@ -40,8 +37,8 @@ schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 pixmap_DATA = planets.png stones.png
 EXTRA_DIST = same-gnome.desktop.in $(pixmap_DATA) $(schema_in_files)
 
-Games_in_files = same-gnome.desktop.in
-Games_DATA = $(Games_in_files:.desktop.in=.desktop)
+Games_in_files = same-gnome.desktop.in.in
+Games_DATA = $(Games_in_files:.desktop.in.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
 SCOREFILES = Small Medium Large
diff --git a/same-gnome/same-gnome.desktop.in b/same-gnome/same-gnome.desktop.in.in
similarity index 91%
rename from same-gnome/same-gnome.desktop.in
rename to same-gnome/same-gnome.desktop.in.in
index db0b96b..bf799ea 100644
--- a/same-gnome/same-gnome.desktop.in
+++ b/same-gnome/same-gnome.desktop.in.in
@@ -10,4 +10,5 @@ Categories=GNOME;GTK;Game;LogicGame;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-games
 X-GNOME-Bugzilla-Component=same-gnome
+X-GNOME-Bugzilla-Version=@VERSION@
 StartupNotify=true
