diff -u powernowd-1.00/debian/changelog powernowd-1.00/debian/changelog
--- powernowd-1.00/debian/changelog
+++ powernowd-1.00/debian/changelog
@@ -1,3 +1,13 @@
+powernowd (1.00-1ubuntu2) intrepid; urgency=low
+
+  * debian/init.d: Don't use ondemand governor when nforce2 driver is 
+    used. Fixes problem with nforce2 boards (LP: #223812).
+  * debian/postinst: added configuration of mandatory gconf settings for
+    gnome-power-manager to prevent it from interfering with powernowd.
+  * debian/postrm: added removal of the settings mentioned above.
+
+ -- Hanno Stock <hanno.stock@gmx.net>  Wed, 02 Jul 2008 19:13:54 +0200
+
 powernowd (1.00-1ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable, remaining changes:
diff -u powernowd-1.00/debian/init.d powernowd-1.00/debian/init.d
--- powernowd-1.00/debian/init.d
+++ powernowd-1.00/debian/init.d
@@ -98,6 +98,13 @@
 	    if [ ! -d $x ] || [ ! -f $x"cpufreq/scaling_governor" ]; then
 	        continue
 	    fi
+	    if [ -f $x"cpufreq/scaling_driver" ]; then
+		case `cat ${x}cpufreq/scaling_driver` in
+		    nforce2)
+			return 1
+			;;
+		esac
+	    fi
 	    echo -n ondemand > $x"cpufreq/scaling_governor"
 	    status=$?
 	    if [ $status != 0 ]; then
diff -u powernowd-1.00/debian/postinst powernowd-1.00/debian/postinst
--- powernowd-1.00/debian/postinst
+++ powernowd-1.00/debian/postinst
@@ -16,2 +16,13 @@
 
+# set mandatory defaults for gnome-power-manager to not interfere with
+# powernowd
+if [ -x /usr/bin/gconftool-2 ] ; then
+	GCONF_CONFIG_SOURCE=xml:readwrite:/etc/gconf/gconf.xml.mandatory/
+	if dpkg -s gnome-power-manager > /dev/null 2>&1 ; then
+		for key in "policy_ac" "policy_battery"; do
+			gconftool-2 --config-source $GCONF_CONFIG_SOURCE --direct --type string --set "/apps/gnome-power-manager/cpufreq/${key}" "nothing"
+		done
+	fi
+fi
+
 ##DEBHELPER##
diff -u powernowd-1.00/debian/postrm powernowd-1.00/debian/postrm
--- powernowd-1.00/debian/postrm
+++ powernowd-1.00/debian/postrm
@@ -5,6 +5,15 @@
 	update-rc.d powernowd.early remove >/dev/null || exit 0
 fi
 
+# remove previously installed mandatory defaults for gnome-power-manager
+if [ -x /usr/bin/gconftool-2 ] ; then
+	GCONF_CONFIG_SOURCE=xml:readwrite:/etc/gconf/gconf.xml.mandatory/
+	for key in "policy_battery" "policy_ac"; do
+		if [ "`gconftool-2 --config-source $GCONF_CONFIG_SOURCE --direct --get /apps/gnome-power-manager/cpufreq/$key 2>/dev/null`" = "nothing" ] ; then
+			gconftool-2 --config-source $GCONF_CONFIG_SOURCE --direct -u /apps/gnome-power-manager/cpufreq/$key
+		fi
+	done
+fi
 ##DEBHELPER##