diff --git a/debian/changelog b/debian/changelog
index 4eb9792a79..7add578554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ evolution (2.8.2-1) UNRELEASED; urgency=low
   * New upstream release
     - debian/control: Move prefer plain plugin to standard
     - 70_no-mail-remote-plugin.patch: Update patch
+    - 20_install-data-files.patch: Fix data file install bug
   * Document mailbox summary corruption and removal of
     IMAP4rev1 provider. [debian/README.Debian]
   * Document common network-manager error messages.
@@ -15,7 +16,7 @@ evolution (2.8.2-1) UNRELEASED; urgency=low
   * Don't depend on HAL and NetworkManager on non-Linux archs. Thanks to
     Petr Salinger. (closes: #401540) [debian/control]
 
- -- Oystein Gisnas <oystein@gisnas.net>  Sun,  7 Jan 2007 14:26:13 +0100
+ -- Oystein Gisnas <oystein@gisnas.net>  Sun,  7 Jan 2007 15:21:39 +0100
 
 evolution (2.8.1.1-1) experimental; urgency=low
 
diff --git a/debian/patches/20_install-data-files.patch b/debian/patches/20_install-data-files.patch
new file mode 100644
index 0000000000..86408c7e36
--- /dev/null
+++ b/debian/patches/20_install-data-files.patch
@@ -0,0 +1,44 @@
+diff -Nur evolution-2.8.2/data/Makefile.am evolution-2.8.2.new/data/Makefile.am
+--- evolution-2.8.2/data/Makefile.am	2006-11-14 19:12:37.000000000 +0100
++++ evolution-2.8.2.new/data/Makefile.am	2007-01-07 15:19:54.000000000 +0100
+@@ -25,10 +25,10 @@
+ install-kde-applnk:
+ 	$(mkinstalldirs) $(DESTDIR)$(kdedesktopdir);	\
+ 	$(INSTALL_DATA) $(kdedesktop_file) \
+-		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
++		        $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
+ 
+ uninstall-kde-applnk:
+-	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file:.desktop=-$(BASE_VERSION).desktop)
++	rm -rf $(DESTDIR)$(kdedesktopdir)/$(kdedesktop_file)
+ 
+ else
+ 
+@@ -45,16 +45,16 @@
+ install-data-local: install-kde-applnk $(desktop_file) $(keys_file) $(mime_file)
+ 	$(mkinstalldirs) $(DESTDIR)$(desktopdir);							\
+ 	$(INSTALL_DATA) $(desktop_file)									\
+-			$(DESTDIR)$(desktopdir)/$(desktop_file:.desktop ;	\
++			$(DESTDIR)$(desktopdir)/$(desktop_file) ;	\
+ 	$(mkinstalldirs) $(DESTDIR)$(keysdir);								\
+-	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file:.keys ;	\
++	$(INSTALL_DATA) $(keys_file) $(DESTDIR)$(keysdir)/$(keys_file) ;	\
+ 	$(mkinstalldirs) $(DESTDIR)$(mimedir);								\
+-	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file:.mime ;
++	$(INSTALL_DATA) $(srcdir)/$(mime_file) $(DESTDIR)$(mimedir)/$(mime_file) ;
+ 
+ uninstall-local: uninstall-kde-applnk
+-	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file:.desktop=-$(BASE_VERSION).desktop) ; 	\
+-	rm -rf $(DESTDIR)$(keysdir)/$(keys_file:.keys=-$(BASE_VERSION).keys) ;	\
+-	rm -rf $(DESTDIR)$(mimedir)/$(mime_file:.mime=-$(BASE_VERSION).mime) ;
++	rm -rf $(DESTDIR)$(desktopdir)/$(desktop_file) ; 	\
++	rm -rf $(DESTDIR)$(keysdir)/$(keys_file) ;	\
++	rm -rf $(DESTDIR)$(mimedir)/$(mime_file) ;
+ 
+ # CDE Stuff
+ 
+@@ -80,3 +80,4 @@
+ 	$(keys_in_file)				\
+ 	$(noinst_MANS)
+ 
++