diff --git a/debian/changelog b/debian/changelog
index b110c59..0c63269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 lubuntu-default-settings (0.12) UNRELEASED; urgency=low
 
-  * 
+  * debian/postinst:
+   - Remove alternatives file if it's not a symlink (LP: #625485).
 
  -- Julien Lavergne <gilir@ubuntu.com>  Wed, 29 Sep 2010 00:46:48 +0200
 
diff --git a/debian/postinst b/debian/postinst
index ab7b202..b89a8ed 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -2,6 +2,12 @@
 
 set -e
 
+# Remove alternative file if it's not a symlink, workaround for broken upgrade
+# See bug #625485
+if [ ! -h "/etc/alternatives/lxdm.conf" ] ; then
+  rm "/etc/alternatives/lxdm.conf"
+fi
+
 if [ "$1" = configure ]; then
   update-alternatives --install /etc/lxdm/default.conf \
     lxdm.conf /etc/xdg/lubuntu/lxdm/lxdm.conf 60