diff --git a/procps.changes b/procps.changes
index 1ebb36c..b89a3c0 100644
--- a/procps.changes
+++ b/procps.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Tue Dec 15 00:26:38 CET 2009 - jengelh@medozas.de
+
+- enable parallel building
+
+-------------------------------------------------------------------
+Wed Nov 25 13:23:10 CET 2009 - werner@suse.de
+
+- Add a commented line to sysctl.conf how to disable IPv6 (bnc#558325)
+
 -------------------------------------------------------------------
 Thu Sep 10 10:13:00 CEST 2009 - werner@suse.de
 
diff --git a/procps.spec b/procps.spec
index 19e9e8a..aa00c16 100644
--- a/procps.spec
+++ b/procps.spec
@@ -22,12 +22,12 @@ Name:           procps
 BuildRequires:  ncurses-devel
 BuildRequires:  libselinux-devel
 Url:            http://procps.sf.net
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Group:          System/Monitoring
 PreReq:         %fillup_prereq %insserv_prereq
 AutoReqProv:    on
 Version:        3.2.8
-Release:        5
+Release:        6
 Summary:        ps utilities for /proc
 Provides:       ps
 Obsoletes:      ps
@@ -122,7 +122,7 @@ Authors:
 %patch29
 
 %build
-make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \
+make %{?jobs:-j%jobs} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \
      CC="gcc"
 
 %install
diff --git a/sysctl.conf b/sysctl.conf
index e75e741..fa5964f 100644
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -3,7 +3,9 @@
 net.ipv4.icmp_echo_ignore_broadcasts = 1
 # enable route verification on all interfaces
 net.ipv4.conf.all.rp_filter = 1
-# enable ipV6 forwarding
+# disable IPv6 completely
+#net.ipv6.conf.all.disable_ipv6 = 1
+# enable IPv6 forwarding
 #net.ipv6.conf.all.forwarding = 1
 # increase the number of possible inotify(7) watches
 fs.inotify.max_user_watches = 65536