diff --git a/.gitignore b/.gitignore
index e5f022b..44fb165 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,8 @@ Makefile.in
 /compile
 /tags
 /data/*.gschema.valid
+/data/astrognome.desktop
+/data/astrognome.desktop.in
 
 # Generated files
 /src/ag-resources.c
@@ -55,6 +57,7 @@ Makefile.in
 /po/insert-header.sin
 /po/quot.sed
 /po/remove-potcdate.sin
+/po/.intltool-merge-cache
 
 #Documentation related files
 /docs/reference/*/*.args
diff --git a/configure.ac b/configure.ac
index d5f47d7..504abdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ AC_CONFIG_FILES([
     src/Makefile
     po/Makefile.in
     data/Makefile
+    data/astrognome.desktop.in
     data/geonames/Makefile
     data/icons/Makefile
 ])
diff --git a/data/Makefile.am b/data/Makefile.am
index 9777d3d..1f86f04 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,5 @@
 SUBDIRS = icons geonames
+
 chartdatadir = $(pkgdatadir)
 chartdata_DATA = chart.xsl            \
 				 chart.css            \
@@ -21,5 +22,22 @@ gsettings_SCHEMAS = \
 					$(NULL)
 @GSETTINGS_RULES@
 
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir = $(datadir)/applications
+desktop_in_files = astrognome.desktop.in
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+
 EXTRA_DIST = \
-			 $(chartdata_DATA)
+			 $(chartdata_DATA)    \
+			 $(desktop_in_files)  \
+			 $(gsettings_SCHEMAS) \
+			 $(NULL)
+
+CLEANFILES = \
+			 $(DESKTOP_FILES) \
+			 $(NULL)
+
+DISTCLEANFILES = \
+				 $(desktop_DATA) \
+				 $(NULL)
diff --git a/data/astrognome.desktop.in.in b/data/astrognome.desktop.in.in
new file mode 100644
index 0000000..1183be2
--- /dev/null
+++ b/data/astrognome.desktop.in.in
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Astrognome
+_Comment=Create natal charts
+_GenericName=Astrologers' software
+_Keywords=astrology;natal;chart;birth;horoscope;
+Exec=astrognome
+Terminal=false
+Type=Application
+Icon=astrognome
+Categories=GNOME;GTK;Utility;Science;
+StartupNotify=TRUE
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d517a21..8f961a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,6 @@
 # List of source files containing traslatable strings.
 
+data/astrognome.desktop.in.in
 src/ag-app.c
 src/ag-window.c
 src/astrognome.c
diff --git a/po/hu.po b/po/hu.po
index 89693bd..9f2c9a6 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: astrognome master\n"
 "Report-Msgid-Bugs-To: gergely@polonkai.eu\n"
-"POT-Creation-Date: 2013-09-21 20:34+0200\n"
+"POT-Creation-Date: 2013-09-21 22:17+0200\n"
 "PO-Revision-Date: 2013-09-21 20:17+0200\n"
 "Last-Translator: Gergely Polonkai <gergely@polonkai.eu>\n"
 "Language-Team: Hungarian <gergely@polonkai.eu>\n"
@@ -17,39 +17,27 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/astrognome.c:40
-msgid "All files"
-msgstr "Minden fájl"
+#. i18n: Please don't translate "Astrognome" (it's marked as translatable for transliteration only
+#: ../data/astrognome.desktop.in.in.h:1 ../src/ag-app.c:85 ../src/ag-app.c:273
+msgid "Astrognome"
+msgstr "Astrognome"
 
-#: ../src/astrognome.c:45
-msgid "Astrognome charts"
-msgstr "Astrognome képletek"
+#: ../data/astrognome.desktop.in.in.h:2
+msgid "Create natal charts"
+msgstr "Készítsen születési képleteket"
 
-#: ../src/astrognome.c:59
-msgid "Opens a new Astrognome window"
-msgstr "Új Astrognome ablakot nyit meg"
+#: ../data/astrognome.desktop.in.in.h:3
+msgid "Astrologers' software"
+msgstr "Asztrológiai szoftver"
 
-#: ../src/astrognome.c:60
-msgid "Display version and exit"
-msgstr "Megjeleníti a verziószámot, majd kilép"
-
-#: ../src/astrognome.c:61
-msgid "Quit any running Astrognome"
-msgstr "Minden Astrognome ablak bezárása"
-
-#: ../src/astrognome.c:81
-msgid "[FILE…]"
-msgstr "[FÁJL…]"
+#: ../data/astrognome.desktop.in.in.h:4
+msgid "astrology;natal;chart;birth;horoscope;"
+msgstr "asztrológia;képlet;születési;horoszkóp;"
 
 #: ../src/ag-app.c:81
 msgid "translator_credits"
 msgstr "Polonkai Gergely <gergely kukac polonkai pont eu>"
 
-#. i18n: Please don't translate "Astrognome" (it's marked as translatable for transliteration only
-#: ../src/ag-app.c:85 ../src/ag-app.c:273
-msgid "Astrognome"
-msgstr "Astrognome"
-
 #: ../src/ag-app.c:87
 msgid "Astrologers' software for GNOME"
 msgstr "Asztrológiai szoftver a GNOME-hoz"
@@ -142,6 +130,30 @@ msgstr "Fényszögek"
 msgid "Points"
 msgstr "Pont-táblázatok"
 
+#: ../src/astrognome.c:40
+msgid "All files"
+msgstr "Minden fájl"
+
+#: ../src/astrognome.c:45
+msgid "Astrognome charts"
+msgstr "Astrognome képletek"
+
+#: ../src/astrognome.c:59
+msgid "Opens a new Astrognome window"
+msgstr "Új Astrognome ablakot nyit meg"
+
+#: ../src/astrognome.c:60
+msgid "Display version and exit"
+msgstr "Megjeleníti a verziószámot, majd kilép"
+
+#: ../src/astrognome.c:61
+msgid "Quit any running Astrognome"
+msgstr "Minden Astrognome ablak bezárása"
+
+#: ../src/astrognome.c:81
+msgid "[FILE…]"
+msgstr "[FÁJL…]"
+
 #: ../src/astrognome.ui.h:1
 msgid "New window"
 msgstr "Új ablak"
@@ -169,3 +181,7 @@ msgstr "Mentés"
 #: ../src/astrognome.ui.h:7
 msgid "Save as…"
 msgstr "Mentés másként…"
+
+#: ../src/astrognome.ui.h:8
+msgid "Close"
+msgstr "Bezárás"