diff --git a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
index f67407ffb3..e67ce529a5 100644
--- a/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/map_search.js.coffee
@@ -7,6 +7,22 @@ Darkswarm.directive 'mapSearch', ($timeout)->
   link: (scope, elem, attrs, ctrl)->
     $timeout =>
       map = ctrl.getMap()
+
+      # Use OSM tiles server
+      map.mapTypes.set 'OSM', new (google.maps.ImageMapType)(
+        getTileUrl: (coord, zoom) ->
+          # "Wrap" x (logitude) at 180th meridian properly
+          # NB: Don't touch coord.x because coord param is by reference, and changing its x property breakes something in Google's lib
+          tilesPerGlobe = 1 << zoom
+          x = coord.x % tilesPerGlobe
+          if x < 0
+            x = tilesPerGlobe + x
+          # Wrap y (latitude) in a like manner if you want to enable vertical infinite scroll
+          'http://tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
+        tileSize: new (google.maps.Size)(256, 256)
+        name: 'OpenStreetMap'
+        maxZoom: 18)
+
       input = (document.getElementById("pac-input"))
       map.controls[google.maps.ControlPosition.TOP_LEFT].push input
       searchBox = new google.maps.places.SearchBox((input))
@@ -21,7 +37,7 @@ Darkswarm.directive 'mapSearch', ($timeout)->
           #map.setCenter place.geometry.location
           map.fitBounds place.geometry.viewport
         #map.fitBounds bounds
-      
+
       # Bias the SearchBox results towards places that are within the bounds of the
       # current map's viewport.
       google.maps.event.addListener map, "bounds_changed", ->
diff --git a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
index 9c5a375d8c..1979affeab 100644
--- a/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/map_configuration.js.coffee
@@ -1,11 +1,14 @@
 Darkswarm.factory "MapConfiguration", ->
   new class MapConfiguration
     options:
-      center: 
+      center:
         latitude: -37.4713077
         longitude: 144.7851531
       zoom: 12
-      additional_options: {}
-        #mapTypeId: 'satellite' 
+      additional_options:
+        # mapTypeId: 'satellite'
+        mapTypeId: 'OSM'
+        mapTypeControl: false
+        streetViewControl: false
       styles: [{"featureType":"landscape","stylers":[{"saturation":-100},{"lightness":65},{"visibility":"on"}]},{"featureType":"poi","stylers":[{"saturation":-100},{"lightness":51},{"visibility":"simplified"}]},{"featureType":"road.highway","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"road.arterial","stylers":[{"saturation":-100},{"lightness":30},{"visibility":"on"}]},{"featureType":"road.local","stylers":[{"saturation":-100},{"lightness":40},{"visibility":"on"}]},{"featureType":"transit","stylers":[{"saturation":-100},{"visibility":"simplified"}]},{"featureType":"administrative.province","stylers":[{"visibility":"off"}]},{"featureType":"water","elementType":"labels","stylers":[{"visibility":"on"},{"lightness":-25},{"saturation":-100}]},{"featureType":"water","elementType":"geometry","stylers":[{"hue":"#ffff00"},{"lightness":-25},{"saturation":-97}]},{"featureType":"road","elementType": "labels.icon","stylers":[{"visibility":"off"}]}]
 
diff --git a/app/assets/stylesheets/darkswarm/map.css.sass b/app/assets/stylesheets/darkswarm/map.css.sass
index a831e9448c..4692bdc1b4 100644
--- a/app/assets/stylesheets/darkswarm/map.css.sass
+++ b/app/assets/stylesheets/darkswarm/map.css.sass
@@ -22,7 +22,21 @@
     background: rgba(255,255,255,0.85)
     width: 50%
     margin-top: 1.2rem
+    margin-left: 1rem
     @media all and (max-width: 768px)
       width: 80%
     &:active, &:focus, &.active
       background: rgba(255,255,255, 1)
+
+.map-footer
+  position: fixed
+  font-size: x-small
+  left: 0
+  right: 0
+  bottom: 0
+  width: 100%
+  height: 23px
+  margin: 0
+  padding: 6px
+  z-index: 2
+  background: #fff
diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
index a4d012282b..97f4eb602d 100644
--- a/app/views/map/index.html.haml
+++ b/app/views/map/index.html.haml
@@ -9,3 +9,7 @@
       %map-search
       %markers{models: "OfnMap.enterprises", fit: "true",
       coords: "'self'", icon: "'icon'", click: "'reveal'"}
+
+.map-footer
+  \©
+  %a{:href => "http://www.openstreetmap.org/copyright"} OpenStreetMap contributors