diff --git a/Makefile.am b/Makefile.am
index 93060ad5c..4f19dce4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ kpathsea = kpathsea/kpathsea.a
 
 # this 10 paths are KDE specific. Use them:
 # kde_htmldir       Where your docs should go to. (contains lang subdirs)
-# kde_appsdir       Where your application file (.kdelnk) should go to. 
+# kde_appsdir       Where your application file (.desktop) should go to. 
 # kde_icondir       Where your icon should go to.
 # kde_minidir       Where your mini icon should go to.
 # kde_datadir       Where you install application data. (Use a subdir)
@@ -65,7 +65,7 @@ messages:
 # if you have more of them, create a subdirectory with an extra Makefile 
 install-data-local: 
 	$(mkinstalldirs) $(APPSDIR)
-	$(INSTALL_DATA) $(srcdir)/kdvi.kdelnk $(APPSDIR)
+	$(INSTALL_DATA) $(srcdir)/kdvi.desktop $(APPSDIR)
 	$(mkinstalldirs) $(kde_icondir)
 	$(INSTALL_DATA) $(srcdir)/pix/kdvi.xpm $(kde_icondir)
 	$(mkinstalldirs) $(kde_minidir)
@@ -73,16 +73,10 @@ install-data-local:
 
 # remove ALL you have installed in install-data-local or install-exec-local
 uninstall-local:
-	-rm -f $(APPSDIR)/Kdvi.kdelnk
+	-rm -f $(APPSDIR)/kdvi.desktop
 	-rm -f $(kde_icondir)/kdvi.xpm
 	-rm -f $(kde_minidir)/kdvi.xpm
 
-clean-local:
-	(cd kpathsea && test -r Makefile && $(MAKE) distclean)
-
-distclean-local:
-	(cd kpathsea && test -r config.status && $(MAKE) distclean)
-
 $(srcdir)/psheader.c: psheader.txt squeeze $(kpathsea)
 	./squeeze $(srcdir)/psheader.txt $@
 
diff --git a/kdvi.desktop b/kdvi.desktop
new file mode 100644
index 000000000..0a72db23d
--- /dev/null
+++ b/kdvi.desktop
@@ -0,0 +1,52 @@
+[Desktop Entry]
+Comment=TeX DVI File Viewer
+Comment[ca]=Visualitzador de fitxers DVI TeX
+Comment[cs]=Prohlí¾eè Device Independent (DVI) souborù
+Comment[da]=TeX DVI-fil fremviser
+Comment[de]=TeX-DVI-Dateibetrachter
+Comment[es]=Visor de archivos TeX DVI
+Comment[fi]=TeX DVI tiedostonäyttäjä
+Comment[fr]=kdvi : Visualiseur de fichier TeX-DVI
+Comment[hr]=TeX DVI preglednik datoteka
+Comment[hu]=TeX DVI fájl nézõ
+Comment[is]=kdvi:  Birta TeX DVI-skjöl
+Comment[it]=Visualizza file TeX DVI
+Comment[no]=TeX-DVI-filviser
+Comment[pl]=Podgl±darka plików TeX DVI
+Comment[pt]=Visualizador de documentos DVI
+Comment[pt_BR]=Visualizador de arquivos DVI
+Comment[ro]=Program pentru vizualizarea fiºierelor DVI (TeX)
+Comment[ru]=ðÒÏÇÒÁÍÍÁ ÄÌÑ ÐÒÏÓÍÏÔÒÁ DVI-ÆÁÊÌÏ× (TeX)
+Comment[sk]=Prehliadaè Device Independent (DVI) súborov z programu TeX
+Comment[sl]=Ogled datotek DVI (TeX)
+Comment[sv]=Visare för TeX DVI-dokument
+BinaryPattern=kdvi;
+Name=DVI Viewer
+Name[ca]=Visualitzador DVI
+Name[cs]=Prohlí¾eè DVI souborù
+Name[da]=DVI-fremviser
+Name[de]=KDvi
+Name[es]=Visor DVI
+Name[fi]=DVI Näyttäjä
+Name[fr]=Visualiseur DVI
+Name[hr]=DVI preglednik
+Name[hu]=DVI nézõ
+Name[is]=DVI-sjá
+Name[it]=Visualizzatore DVI
+Name[no]=DVI-fremviser
+Name[pl]=Przegl±darka DVI
+Name[pt]=Visualizador de DVIs
+Name[pt_BR]=Visualizador de DVIs
+Name[ro]=Vizualizor DVI
+Name[ru]=ðÒÏÓÍÏÔÒÝÉË DVI
+Name[sk]=Prehliadaè DVI
+Name[sl]=Pregledovalnik DVI
+Name[sv]=DVI-visare
+MimeType=application/x-dvi;
+Exec=kdvi %f -caption "%c" %i %m
+TerminalOptions=
+Icon=kdvi.xpm
+MiniIcon=kdvi.xpm
+Path=
+Type=Application
+Terminal=0
diff --git a/kdvi.kdelnk b/kdvi.kdelnk
deleted file mode 100644
index ac143b250..000000000
--- a/kdvi.kdelnk
+++ /dev/null
@@ -1,13 +0,0 @@
-# KDE Config File
-[KDE Desktop Entry]
-Comment=TeX DVI File Viewer
-BinaryPattern=kdvi;
-Name=DVI Viewer
-MimeType=application/x-dvi;
-Exec=kdvi %f -caption "%c" %i %m
-TerminalOptions=
-Icon=kdvi.xpm
-MiniIcon=kdvi.xpm
-Path=
-Type=Application
-Terminal=0