diff --git a/gammu.changes b/gammu.changes
index 7187422..be13685 100644
--- a/gammu.changes
+++ b/gammu.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Oct 26 12:05:38 UTC 2017 - dimstar@opensuse.org
+
+- Explicitly package systemd service on suse_version >= 1330:
+  depending on the dep chain, systemd is already detected (and
+  causes build failures for unpackaged files).
+
+-------------------------------------------------------------------
+Sun Jul 30 10:40:44 UTC 2017 - meissner@suse.com
+
+- forcefully enable PIE as automatism does not trigger.
+
 -------------------------------------------------------------------
 Sat Jun 17 12:27:53 UTC 2017 - ecsos@opensuse.org
 
diff --git a/gammu.spec b/gammu.spec
index 9635965..7990077 100644
--- a/gammu.spec
+++ b/gammu.spec
@@ -119,6 +119,9 @@ BuildRequires:  pkg-config
 %else
 BuildRequires:  pkgconfig
 %endif
+%if 0%{?suse_version} >= 1330
+BuildRequires:  pkgconfig(systemd)
+%endif
 BuildRequires:  %{dist_bluez_libs}
 %if 0%{?suse_version} > 1140
 BuildRequires:  python-Sphinx
@@ -277,8 +280,9 @@ rm -rf helper/win32-*
 %build
 mkdir build
 cd build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
+export CFLAGS="%{optflags} -fPIE"
+export CXXFLAGS="%{optflags} -fPIE"
+export LDFLAGS="-pie"
 cmake ../ \
     -DBUILD_SHARED_LIBS=ON \
     -DCMAKE_INSTALL_PREFIX=%{_prefix} \
@@ -331,6 +335,20 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/
 
 %postun -n libgsmsd%{so_ver} -p /sbin/ldconfig
 
+%if 0%{?suse_version} >= 1330
+%pre smsd
+%service_add_pre gammu-smsd.service
+
+%preun smsd
+%service_del_preun gammu-smsd.service
+
+%post smsd
+%service_add_post gammu-smsd.service
+
+%postun smsd
+%service_del_postun gammu-smsd.service
+%endif
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/bash_completion.d/gammu
@@ -371,6 +389,9 @@ rm -rf %{buildroot}%{_datadir}/locale/sw/
 %{_bindir}/gammu-smsd
 %{_bindir}/gammu-smsd-inject
 %{_bindir}/gammu-smsd-monitor
+%if 0%{?suse_version} >= 1330
+%{_unitdir}/gammu-smsd.service
+%endif
 %doc %{_mandir}/man1/gammu-smsd-inject.1*
 %doc %{_mandir}/man1/gammu-smsd-monitor.1*
 %doc %{_mandir}/man1/gammu-smsd.1*