diff --git a/fabfile.py b/fabfile.py
index 27936656..af369efe 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -231,7 +231,7 @@ def collect_remote_statics(name=None):
         'i18n': 'git://github.com/yohanboniface/Leaflet.i18n.git@master',
         'csv2geojson': 'git://github.com/mapbox/csv2geojson.git@gh-pages',
         'togeojson': 'git://github.com/mapbox/togeojson.git@gh-pages#v0.4.2',
-        'osmtogeojson': 'git://github.com/aaronlidman/osm-and-geojson.git@gh-pages',
+        'osmtogeojson': 'git://github.com/tyrasd/osmtogeojson.git@gh-pages#2.0.5',
         'loading': 'git://github.com/ebrelsford/Leaflet.loading.git@master#v0.1.6',
         'contextmenu': 'git://github.com/aratcliffe/Leaflet.contextmenu.git@master',
         'markercluster': 'git://github.com/Leaflet/Leaflet.markercluster.git@master#0.4',
diff --git a/umap/templates/leaflet_storage/js.html b/umap/templates/leaflet_storage/js.html
index de18cbbb..60a68076 100644
--- a/umap/templates/leaflet_storage/js.html
+++ b/umap/templates/leaflet_storage/js.html
@@ -8,7 +8,7 @@
     <script src="{{ STATIC_URL }}minimap/src/Control.MiniMap.js"></script>
     <script src="{{ STATIC_URL }}csv2geojson/csv2geojson.js"></script>
     <script src="{{ STATIC_URL }}togeojson/togeojson.js"></script>
-    <script src="{{ STATIC_URL }}osmtogeojson/osm_geojson.js"></script>
+    <script src="{{ STATIC_URL }}osmtogeojson/osmtogeojson.js"></script>
     <script src="{{ STATIC_URL }}loading/src/Control.Loading.js"></script>
     <script src="{{ STATIC_URL }}markercluster/dist/leaflet.markercluster-src.js"></script>
     <script src="{{ STATIC_URL }}measure/leaflet.measurecontrol.js"></script>