diff -ur ampache-3.3.1.5/docs/CHANGELOG ampache-3.3.1.6/docs/CHANGELOG
--- ampache-3.3.1.5/docs/CHANGELOG	2005-11-27 18:13:27.000000000 -0800
+++ ampache-3.3.1.6/docs/CHANGELOG	2005-11-29 00:31:13.000000000 -0800
@@ -2,6 +2,13 @@
 ---------                  Ampache -- CHANGELOG                  ---------   
 --------------------------------------------------------------------------
 
+
+--------------------------------------------------------------------------
+  v.3.3.1.6 11/28/2005:
+  	- Updated Snoopy class yet again due to flawed patch which still
+		wasn't properly escaping single quotes. Patch provided
+		by marineam
+
 --------------------------------------------------------------------------
   v.3.3.1.5 11/27/2005:
         - Updated included Snoopy class due to vulenerability
diff -ur ampache-3.3.1.5/modules/amazon/Snoopy.class.php ampache-3.3.1.6/modules/amazon/Snoopy.class.php
--- ampache-3.3.1.5/modules/amazon/Snoopy.class.php	2005-11-27 18:13:27.000000000 -0800
+++ ampache-3.3.1.6/modules/amazon/Snoopy.class.php	2005-11-29 00:29:42.000000000 -0800
@@ -1013,7 +1013,7 @@
 		$headerfile = tempnam($temp_dir, "sno");
 
 		$safer_URI = strtr( $URI, "\"", " " ); // strip quotes from the URI to avoid shell access
-		exec($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\"",$results,$return);
+		exec(escapeshellcmd($this->curl_path." -D \"$headerfile\"".$cmdline_params." \"".$safer_URI."\""),$results,$return);
 		
 		if($return)
 		{
diff -ur ampache-3.3.1.5/modules/init.php ampache-3.3.1.6/modules/init.php
--- ampache-3.3.1.5/modules/init.php	2005-11-27 18:13:52.000000000 -0800
+++ ampache-3.3.1.6/modules/init.php	2005-11-29 00:29:43.000000000 -0800
@@ -83,7 +83,7 @@
 }
 
 $results['conf']['web_path']		= $http_type . $_SERVER['HTTP_HOST'] . $results['conf']['web_path'];
-$results['conf']['version']		= '3.3.1.5';
+$results['conf']['version']		= '3.3.1.6';
 $results['conf']['catalog_file_pattern']= 'mp3|mpc|m4p|m4a|mp4|aac|ogg|rm|wma|asf|flac|spx';
 $results['libglue']['local_table']	= 'session';
 $results['libglue']['local_sid']	= 'id';