diff --git a/python-M2Crypto.changes b/python-M2Crypto.changes
index f37cff5..a8fbbd3 100644
--- a/python-M2Crypto.changes
+++ b/python-M2Crypto.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 13 14:52:08 UTC 2013 - jmatejek@suse.com
+
+- fixed %fdupes creating dangling symlinks (bnc#835687)
+
 -------------------------------------------------------------------
 Fri Apr  5 13:41:54 UTC 2013 - idonmez@suse.com
 
diff --git a/python-M2Crypto.spec b/python-M2Crypto.spec
index a7e0532..633f852 100644
--- a/python-M2Crypto.spec
+++ b/python-M2Crypto.spec
@@ -62,15 +62,23 @@ original M2Crypto homepage is at http://sandbox.rulemaker.net/ngps/m2/.
 CFLAGS="%{optflags}" python setup.py build
 
 %install
-chmod 0644 demo/{https.howto/get_https,ssl/twistedsslclient,ssl/twistedsslserver,tinderbox/slave,x509/certdata2pem}.py # Fix executable bit for documentation:
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-%if 0%{?suse_version} > 1010
-%fdupes -s demo
-%endif
+
+# install demo files manually
+# (otherwise we can't perform %%fdupes on them the right way)
+#chmod 0644 demo/{https.howto/get_https,ssl/twistedsslclient,ssl/twistedsslserver,tinderbox/slave,x509/certdata2pem}.py
+export DOCDIR=%{buildroot}%{_docdir}/%{name}
+
+chmod -R -x+X demo
+mkdir -p   $DOCDIR
+cp -r demo $DOCDIR
+%fdupes    $DOCDIR
+
+install -m 644 CHANGES LICENCE README $DOCDIR
 
 %files
 %defattr(-,root,root)
-%doc CHANGES LICENCE README demo
+%doc %{_docdir}/%{name}
 %{python_sitearch}/*
 
 %changelog