diff --git a/stunnel.spec b/stunnel.spec
index 65dcba4..e97e567 100644
--- a/stunnel.spec
+++ b/stunnel.spec
@@ -8,6 +8,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+# norootforbuild
 
 Name:           stunnel
 BuildRequires:  openssl-devel
@@ -69,10 +70,12 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/stunnel
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 make \
-	confdir=$RPM_BUILD_ROOT/%{_sysconfdir}/stunnel \
-	sbindir=$RPM_BUILD_ROOT/%{_sbindir} \
-	libdir=$RPM_BUILD_ROOT/%{_libdir} \
-	mandir=$RPM_BUILD_ROOT/%{_mandir} \
+	confdir=%{_sysconfdir}/stunnel \
+	sbindir=%{_sbindir} \
+	libdir=%{_libdir} \
+	mandir=%{_mandir} \
+	docdir=%{_docdir}/%{name} \
+	DESTDIR=$RPM_BUILD_ROOT \
 	install
 cp -p %{S:1} tools/stunnel.conf-sample
 cp -p %{S:2} README.%VENDOR
@@ -146,6 +149,7 @@ fi
 
 %changelog -n stunnel
 * Fri Jun 23 2006 - poeml@suse.de
+- build as non-root
 - build with fPIE/pie on SUSE 10.0 or newer, or on any other
   platform
 - fix BuildRequires for Fedora Core, and wrap suse_version macros