diff --git a/Manifest.txt b/Manifest.txt
index 832def4..8efe2a1 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -7,8 +7,8 @@ History.rdoc
 LICENSE
 Manifest.txt
 POSTGRES
-README-OS_X.rdoc
-README-Windows.rdoc
+readme-os_x.rdoc
+readme-windows.rdoc
 README.ja.rdoc
 README.rdoc
 Rakefile
diff --git a/postgres b/POSTGRES
similarity index 100%
rename from postgres
rename to POSTGRES
diff --git a/Rakefile b/Rakefile
index 3fd7c46..f422189 100644
--- a/Rakefile
+++ b/Rakefile
@@ -114,7 +114,6 @@ Rake::ExtensionTask.new do |ext|
 		"--with-opt-include=#{STATIC_POSTGRESQL_INCDIR}",
 		"--with-pg-lib=#{STATIC_POSTGRESQL_LIBDIR}",
 		"--with-opt-lib=#{STATIC_OPENSSL_BUILDDIR}",
-		"--enable-static-build",
 	]
 end
 
diff --git a/ext/extconf.rb b/ext/extconf.rb
index c17aa72..752f518 100644
--- a/ext/extconf.rb
+++ b/ext/extconf.rb
@@ -4,7 +4,7 @@ require 'mkmf'
 
 if ENV['MAINTAINER_MODE']
 	$stderr.puts "Maintainer mode enabled."
-	$CFLAGS << 
+	$CFLAGS <<
 		' -Wall' <<
 		' -ggdb' <<
 		' -DDEBUG' <<
@@ -32,7 +32,7 @@ if pgconfig = ( with_config('pg-config') || with_config('pg_config') || find_exe
 	$stderr.puts "Using config values from %s" % [ pgconfig ]
 	$CPPFLAGS << " -I%s" % [ `"#{pgconfig}" --includedir`.chomp ]
 	$LDFLAGS << " -L%s" % [ `"#{pgconfig}" --libdir`.chomp ]
-	$LIBS << " " << `"#{pgconfig}" --libs`.chomp
+	$LIBS << " " << `"#{pgconfig}" --libs`.chomp unless ENV['CROSS_COMPILING']
 else
 	$stderr.puts "No pg_config... trying anyway. If building fails, please try again with",
 		" --with-pg-config=/path/to/pg_config"
diff --git a/ext/pg.h b/ext/pg.h
index a1698ce..1a6827c 100644
--- a/ext/pg.h
+++ b/ext/pg.h
@@ -74,6 +74,7 @@
 #if defined(_WIN32)
 #	include <fcntl.h>
 __declspec(dllexport)
+typedef long suseconds_t;
 #endif