diff -Nru powertop-1.98+2011.07.1/debian/changelog powertop-1.98+2011.08.1/debian/changelog
--- powertop-1.98+2011.07.1/debian/changelog	2011-07-27 01:36:01.000000000 +0000
+++ powertop-1.98+2011.08.1/debian/changelog	2011-08-19 10:30:39.000000000 +0000
@@ -1,3 +1,9 @@
+powertop (1.98+2011.08.1-1linaro1) natty; urgency=low
+
+  * New Linaro release (2011.08.1)
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Fri, 19 Aug 2011 07:30:11 -0300
+
 powertop (1.98+2011.07.1-1linaro1) natty; urgency=low
 
   * New Linaro release (2011.07.1)
diff -Nru powertop-1.98+2011.07.1/debian/patches/debian-changes-1.98+2011.07.1-1linaro1 powertop-1.98+2011.08.1/debian/patches/debian-changes-1.98+2011.07.1-1linaro1
--- powertop-1.98+2011.07.1/debian/patches/debian-changes-1.98+2011.07.1-1linaro1	2011-07-27 01:37:02.000000000 +0000
+++ powertop-1.98+2011.08.1/debian/patches/debian-changes-1.98+2011.07.1-1linaro1	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Description: Upstream changes introduced in version 1.98+2011.07.1-1linaro1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- powertop (1.98+2011.07.1-1linaro1) natty; urgency=low
- .
-   * New Linaro release (2011.07.1)
-   * Packaging based on debian's powertop
- .
- The person named in the Author field signed this changelog entry.
-Author: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ powertop-1.98+2011.07.1/.gbp.conf
-@@ -0,0 +1,4 @@
-+[git-buildpackage]
-+debian-branch = debian
-+upstream-tag = linaro/%(version)s
-+debian-tag = debian/%(version)s
diff -Nru powertop-1.98+2011.07.1/debian/patches/debian-changes-1.98+2011.08.1-1linaro1 powertop-1.98+2011.08.1/debian/patches/debian-changes-1.98+2011.08.1-1linaro1
--- powertop-1.98+2011.07.1/debian/patches/debian-changes-1.98+2011.08.1-1linaro1	1970-01-01 00:00:00.000000000 +0000
+++ powertop-1.98+2011.08.1/debian/patches/debian-changes-1.98+2011.08.1-1linaro1	2011-08-19 10:31:55.000000000 +0000
@@ -0,0 +1,32 @@
+Description: Upstream changes introduced in version 1.98+2011.08.1-1linaro1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ powertop (1.98+2011.08.1-1linaro1) natty; urgency=low
+ .
+   * New Linaro release (2011.08.1)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- /dev/null
++++ powertop-1.98+2011.08.1/.gbp.conf
+@@ -0,0 +1,4 @@
++[git-buildpackage]
++debian-branch = debian
++upstream-tag = linaro/%(version)s
++debian-tag = debian/%(version)s
diff -Nru powertop-1.98+2011.07.1/debian/patches/series powertop-1.98+2011.08.1/debian/patches/series
--- powertop-1.98+2011.07.1/debian/patches/series	2011-07-27 01:37:02.000000000 +0000
+++ powertop-1.98+2011.08.1/debian/patches/series	2011-08-19 10:31:55.000000000 +0000
@@ -1 +1 @@
-debian-changes-1.98+2011.07.1-1linaro1
+debian-changes-1.98+2011.08.1-1linaro1
diff -Nru powertop-1.98+2011.07.1/main.cpp powertop-1.98+2011.08.1/main.cpp
--- powertop-1.98+2011.07.1/main.cpp	2011-07-26 08:09:56.000000000 +0000
+++ powertop-1.98+2011.08.1/main.cpp	2011-08-16 13:12:05.000000000 +0000
@@ -201,6 +201,9 @@
 {
 	string boardname;
 	char filename[4096];
+	char data[512];
+	FILE *fp;
+	int i;
 
 	if (access("/etc/boardname", R_OK ) == 0){
 		boardname = read_sysfs_string("/etc/boardname");
@@ -211,29 +214,17 @@
 		sprintf(filename, "/var/cache/powertop/saved_parameters.powertop.%s", boardname.c_str());
 	}
 	else if (access("/data", R_OK ) == 0){
-		FILE *fp;
-		char data[512];
-		fp = popen("getprop ro.build.product","r");
-
-		if(!fp){
-			fprintf(stderr, "Could not open pipe for output.\n");
-			return;
-		}
-
-		if (fgets(data, 512 , fp)== NULL)
-			return;
-
-		pclose(fp);
-
-		sprintf(filename, "/data/local/powertop/saved_parameters.powertop.%s", data);
+		sprintf(filename,"saved_parameters.powertop");
 	}
 	else
 		return;
 
-	if (access(filename, R_OK))
+	load_parameters(filename);
+
+	if (access(filename, R_OK) == 0) {
 		return;
+	}
 
-	load_parameters(filename);
 	global_fixed_parameters = 1;
 	global_power_override = 1;
 }
@@ -328,7 +319,6 @@
 	register_parameter("disk-operations-hard", 0.2);
 	register_parameter("disk-operations", 0.0);
 	register_parameter("xwakes", 0.1);
-
 	load_board_params();
 
 	while (1) { /* parse commandline options */
diff -Nru powertop-1.98+2011.07.1/parameters/persistent.cpp powertop-1.98+2011.08.1/parameters/persistent.cpp
--- powertop-1.98+2011.07.1/parameters/persistent.cpp	2011-07-26 08:09:56.000000000 +0000
+++ powertop-1.98+2011.08.1/parameters/persistent.cpp	2011-08-16 13:12:05.000000000 +0000
@@ -43,7 +43,7 @@
 
 	file.open(pathname, ios::out);
 	if (!file) {
-		cout << _("Cannot save to file ") << pathname << "\n";
+		cout << _("Cannot save all results to file ") << pathname << "\n";
 		return;
 	}
 	for (i = 0; i < past_results.size(); i++) {	
@@ -74,8 +74,9 @@
 	pathname = get_param_directory(filename);
 
 	file.open(pathname, ios::in);
-	if (!file) {
-		cout << _("Cannot load from file ") << pathname << "\n";
+
+	if (!file.is_open()) {
+		cout << _("Cannot load results from file ") << pathname << "\n";
 		return;
 	}
 
@@ -136,7 +137,7 @@
 
 	file.open(pathname, ios::out);
 	if (!file) {
-		cout << _("Cannot save to file ") << pathname << "\n";
+		cout << _("Cannot save parameters to file ") << pathname << "\n";
 		return;
 	}
 	
@@ -160,8 +161,8 @@
 	pathname = get_param_directory(filename);
 
 	file.open(pathname, ios::in);
-	if (!file) {
-		cout << _("Cannot load from file ") << pathname << "\n";
+	if (!file.is_open()) {
+		cout << _("Cannot load parameters from file ") << pathname << "\n";
 		return;
 	}