diff --git a/headers/private/shared/Geolocation.h b/headers/private/shared/Geolocation.h
index b458f9e735..cad1e176bd 100644
--- a/headers/private/shared/Geolocation.h
+++ b/headers/private/shared/Geolocation.h
@@ -9,6 +9,9 @@
 #include <Url.h>
 
 
+namespace BPrivate {
+
+
 class BGeolocation {
 public:
 				BGeolocation();
@@ -26,4 +29,7 @@ private:
 };
 
 
+}	// namespace BPrivate
+
+
 #endif
diff --git a/src/kits/network/libnetapi/Jamfile b/src/kits/network/libnetapi/Jamfile
index 2f8fc3c6e7..285858c46d 100644
--- a/src/kits/network/libnetapi/Jamfile
+++ b/src/kits/network/libnetapi/Jamfile
@@ -50,7 +50,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			NetworkInterface.cpp
 			NetworkRoster.cpp
 			RouteSupport.cpp
-			
+
 			AbstractSocket.cpp
 			DatagramSocket.cpp
 			Socket.cpp
@@ -59,8 +59,6 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			# TODO: another add-on for file:// (a much simpler one)
 			FileRequest.cpp
 
-			Geolocation.cpp
-
 			# TODO: another add-on for gopher://
 			GopherRequest.cpp
 
diff --git a/src/kits/network/libnetapi/Geolocation.cpp b/src/kits/shared/Geolocation.cpp
similarity index 98%
rename from src/kits/network/libnetapi/Geolocation.cpp
rename to src/kits/shared/Geolocation.cpp
index c80411138f..af6099b0ab 100644
--- a/src/kits/network/libnetapi/Geolocation.cpp
+++ b/src/kits/shared/Geolocation.cpp
@@ -16,6 +16,9 @@
 #include <UrlRequest.h>
 
 
+namespace BPrivate {
+
+
 BGeolocation::BGeolocation()
 	: fService(kDefaultService)
 {
@@ -141,3 +144,6 @@ BGeolocation::LocateSelf(float& latitude, float& longitude)
 // FIXME switch to an openly available service that will actually work with the
 // "standard" geolocation API. Openbmap has a few variations.
 const char* BGeolocation::kDefaultService = "http://openbmap.org/api/json.php5";
+
+
+}	// namespace BPrivate
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index 6867447673..20cd4908d9 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -30,6 +30,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			CommandPipe.cpp
 			DragTrackingFilter.cpp
 			DriverSettingsMessageAdapter.cpp
+			Geolocation.cpp
 			HashString.cpp
 			IconButton.cpp
 			IconView.cpp