--- kildclient-2.11.0/Makefile.am	
+++ kildclient-2.11.0/Makefile.am	
@@ -11,11 +11,7 @@ SUBDIRS = po \
           share
 endif
 
-pkgdocdir = $(datadir)/doc/kildclient
-
-pkgdoc_DATA = README AUTHORS NEWS COPYING
-
-appsdir = $(datadir)/applications
+appsdir = /usr/share/applications
 apps_DATA = kildclient.desktop
 
 EXTRA_DIST = getperlflags.pl \
--- kildclient-2.11.0/doc/C/Makefile.am	
+++ kildclient-2.11.0/doc/C/Makefile.am	
@@ -2,9 +2,9 @@ 
 
 SUBDIRS = images
 
-pkgdocdir = $(datadir)/doc/kildclient
+pkgdocdir = @docdir@
 
-manualdir = $(pkgdocdir)/html
+manualdir = @htmldir@
 
 #pkgdoc_DATA = kildclient.pdf
 
--- kildclient-2.11.0/kildclient.desktop	
+++ kildclient-2.11.0/kildclient.desktop	
@@ -4,7 +4,7 @@ Type=Application
 Exec=kildclient
 Icon=kildclient
 Terminal=false
-Categories=Network;RolePlaying;
+Categories=Game;Network;RolePlaying;
 
 Name=KildClient
 Name[eo]=KildClient
--- kildclient-2.11.0/po/Makefile.in.in	
+++ kildclient-2.11.0/po/Makefile.in.in	
@@ -28,9 +28,8 @@ exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 datadir = @datadir@
 libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+localedir = @localedir@
+gnulocaledir = @localedir@
 subdir = po
 
 INSTALL = @INSTALL@
@@ -168,17 +167,6 @@ install-data-yes: all
 	    fi; \
 	  fi; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  if test -r "$(MKINSTALLDIRS)"; then \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
-	  else \
-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
 
 # Define this as empty until I found a useful application.
 installcheck:
@@ -193,9 +181,6 @@ uninstall:
 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
 	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
 	done
-	if test "$(PACKAGE)" = "glib"; then \
-	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
-	fi
 
 check: all
 
--- kildclient-2.11.0/share/Makefile.am	
+++ kildclient-2.11.0/share/Makefile.am	
@@ -6,7 +6,7 @@ pkgdata_DATA = 	kildclient.pl \
 		kildclient.hlp \
 		kcworld.dtd
 
-pixmapdir = $(datadir)/pixmaps
+pixmapdir = /usr/share/pixmaps
 pixmap_DATA = kildclient.png kildclient.xpm
 
 
--- kildclient-2.11.0/src/Makefile.am	
+++ kildclient-2.11.0/src/Makefile.am	
@@ -82,14 +82,14 @@ gladefiles = kildclient.glade \
 
 EXTRA_DIST = $(pkgdata_DATA) $(gladefiles)
 
-pkgdocdir = $(datadir)/doc/kildclient
+pkgdocdir = @datadir@
 
-manualdir = $(pkgdocdir)/html
+manualdir = @htmldir@
 
 
 kildclient_LDADD = $(GTK_LIBS) $(KILDCLIENT_PERL_LIBS) $(GTKSPELL_LIBS) $(LIBGNUTLS_LIBS) $(INTLLIBS) -lz
 
-localedir = $(datadir)/locale
+localedir = @localedir@
 
 INCLUDES = -DLOCALEDIR=\"$(localedir)\" \
            -DPKGDATADIR=\"$(pkgdatadir)\" \
--- kildclient-2.11.0/src/mainwindow.c	
+++ kildclient-2.11.0/src/mainwindow.c	
@@ -181,9 +181,9 @@ create_main_window(WorldGUI *gui)
   window = GTK_WIDGET(gtk_builder_get_object(main_builder, "wndMain"));
 #ifndef __WIN32__
   gtk_window_set_icon_from_file(GTK_WINDOW(window),
-                                SYSDATADIR "/pixmaps/kildclient.png",
+                                "/usr/share/pixmaps/kildclient.png",
                                 NULL);
-  gtk_window_set_default_icon_from_file(SYSDATADIR "/pixmaps/kildclient.png",
+  gtk_window_set_default_icon_from_file("/usr/share/pixmaps/kildclient.png",
                                         NULL);
 #endif