diff --git a/pcsc-lite-1.8.0.tar.bz2 b/pcsc-lite-1.8.0.tar.bz2
deleted file mode 100644
index 3eec88d..0000000
--- a/pcsc-lite-1.8.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4bdd21bb42cddddee302069fc7356d8a2092c214ba289af8c620fa02e5b05e7
-size 538435
diff --git a/pcsc-lite-1.8.1.tar.bz2 b/pcsc-lite-1.8.1.tar.bz2
new file mode 100644
index 0000000..53bbc4c
--- /dev/null
+++ b/pcsc-lite-1.8.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eba006db63d1a67d2314be760e19572c71cec816e51db05da28a41714a6049e0
+size 546082
diff --git a/pcsc-lite.changes b/pcsc-lite.changes
index 54e56f4..cd299c4 100644
--- a/pcsc-lite.changes
+++ b/pcsc-lite.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Dec  7 19:34:17 CET 2011 - sbrabec@suse.cz
+
+- Move libpcsclite.so file to the main package (bnc#732911).
+
+-------------------------------------------------------------------
+Fri Nov 25 19:54:19 UTC 2011 - wr@rosenauer.org
+
+- Updated to version 1.8.1
+  * added missing files in source archive
+
 -------------------------------------------------------------------
 Sat Nov 19 18:25:31 UTC 2011 - wr@rosenauer.org
 
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index d71f45b..4e64114 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -33,7 +33,7 @@ BuildRequires:  libusb-1_0-devel
 BuildRequires:  systemd
 %{?systemd_requires}
 %endif
-Version:        1.8.0
+Version:        1.8.1
 Release:        1
 Requires(pre):  pwdutils
 Group:          Productivity/Security
@@ -47,6 +47,7 @@ Source3:        pre_checkin.sh
 Source4:        baselibs.conf
 Source5:        pcsc-lite-init
 Source6:        pcsc-lite-reader-conf
+Patch0:         systemd-service.patch
 Requires(post): %insserv_prereq %fillup_prereq
 %if %suse_version > 1130
 PreReq:         sysvinit(syslog)
@@ -121,6 +122,7 @@ compile plugins for the pcsc-lite package.
 
 %prep
 %setup -q
+%patch0 -p1
 cp -a %{S:1} %{S:2} %{S:5} %{S:6} .
 
 %build
@@ -168,24 +170,29 @@ exit 0
 %post
 %if %suse_version > 1140
 %service_add_post pcscd.service pcscd.socket
-%else
+/bin/systemctl disable pcscd.service || :
+/bin/systemctl enable pcscd.socket || :
+/bin/systemctl try-restart pcscd.service || :
+/bin/systemctl restart pcscd.socket || :
+%endif
 %fillup_and_insserv -y -n pcscd pcscd
 %restart_on_update pcscd
-%endif
 
 %preun
 %if %suse_version > 1140
 %service_del_preun pcscd.service pcscd.socket
-%else
-%stop_on_removal pcscd
 %endif
+%stop_on_removal pcscd
 
 %postun
 %if %suse_version > 1140
 %service_del_postun pcscd.service pcscd.socket
-%else
-%insserv_cleanup
+# make sure to reload systemd for possible downgrades
+if [ "$1" = "1" ]; then
+  /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 %endif
+%insserv_cleanup
 
 %post -n libpcsclite1 -p /sbin/ldconfig
 
@@ -208,6 +215,8 @@ exit 0
 %endif
 %{_initrddir}/pcscd
 /var/adm/fillup-templates/sysconfig.pcscd
+# libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen().
+%{_libdir}/libpcsclite.so
 
 %files -n libpcsclite1
 %defattr(-,root,root)
@@ -220,8 +229,10 @@ exit 0
 %files devel
 %defattr(-,root,root)
 %{_includedir}/*
-%{_libdir}/*.so
 %{_libdir}/*.*a
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/*.so
+# libpcsclite.so should stay in the main package (#732911). Third party packages may need it for dlopen().
+%exclude %{_libdir}/libpcsclite.so
 
 %changelog
diff --git a/systemd-service.patch b/systemd-service.patch
new file mode 100644
index 0000000..682645a
--- /dev/null
+++ b/systemd-service.patch
@@ -0,0 +1,15 @@
+diff --git a/etc/pcscd.service.in b/etc/pcscd.service.in
+index 68dcfaa..8e632c8 100644
+--- a/etc/pcscd.service.in
++++ b/etc/pcscd.service.in
+@@ -3,7 +3,9 @@ Description=PC/SC Smart Card Daemon
+ Requires=pcscd.socket
+ 
+ [Service]
+-ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit
++Environment=PCSCD_OPTIONS=""
++EnvironmentFile=-/etc/sysconfig/pcscd
++ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_OPTIONS
+ ExecReload=@sbindir_exp@/pcscd --hotplug
+ StandardOutput=syslog
+