diff --git a/aaa_base.changes b/aaa_base.changes
index 145a5c9..8e647a4 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov 10 14:37:16 UTC 2011 - fcrozat@suse.com
+
+- Ensure /sbin/service is not clearing SYSTEMD_NO_WRAP
+
 -------------------------------------------------------------------
 Mon Nov  7 18:26:41 CET 2011 - dmueller@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 0911a81..78247e9 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -35,6 +35,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # run make package in checkout out git repo to recreate
 Source:         aaa_base.tar.bz2
 Source99:       aaa_base-rpmlintrc
+Patch0:         systemd_no_wrap_service.patch
 
 %description
 This package installs several important configuration files. Central
@@ -54,6 +55,7 @@ and convenience hacks).
 
 %prep
 %setup -n aaa_base
+%patch0 -p1
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}
diff --git a/systemd_no_wrap_service.patch b/systemd_no_wrap_service.patch
new file mode 100644
index 0000000..6980f7d
--- /dev/null
+++ b/systemd_no_wrap_service.patch
@@ -0,0 +1,19 @@
+diff --git a/files/sbin/service b/files/sbin/service
+index 5984b28..56ad239 100755
+--- a/files/sbin/service
++++ b/files/sbin/service
+@@ -21,12 +21,13 @@ RCDIR="/etc/init.d"
+ #
+ PATH=/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin
+ test -n "$TERM" || TERM=raw
++test -n "$SYSTEMD_NO_WRAP" && export SYSTEMD_NO_WRAP
+ LANG=POSIX
+ export PATH TERM LANG
+ 
+ exec_rc ()
+ {
+-    env -i LANG=$LANG PATH=$PATH TERM=$TERM ${1+"$@"}
++    env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP ${1+"$@"}
+ }
+ 
+ usage ()