diff --git a/.gitignore b/.gitignore
index 3d6774859d..a83e0026e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,6 @@
 /conf/conf.xml.20*
 /conf/control_panel.xml
 /conf/%gconf.xml
-/conf/srtm_data/*
 /conf/maps_data/*
 /conf/maps.xml
 /conf/gps/ublox_conf
diff --git a/Makefile b/Makefile
index 6887cbc61a..378f9375d8 100644
--- a/Makefile
+++ b/Makefile
@@ -251,7 +251,6 @@ dist_clean :
 	@echo "Warning: This removes all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: make dist_clean_irreversible"
 
 dist_clean_irreversible: clean
-	rm -rf conf/srtm_data
 	rm -rf conf/maps_data conf/maps.xml
 	rm -rf conf/conf.xml conf/controlpanel.xml
 	rm -rf var
@@ -276,8 +275,4 @@ sw/simulator/launchsitl:
 	cat src/$(@F) | sed s#OCAMLRUN#$(OCAMLRUN)# | sed s#OCAML#$(OCAML)# > $@
 	chmod a+x $@
 
-#.SUFFIXES: .hgt.zip
-
-%.hgt.zip:
-	cd data/srtm; $(MAKE) $(@)
 
diff --git a/data/srtm/Makefile b/data/srtm/Makefile
deleted file mode 100644
index 80ac333eee..0000000000
--- a/data/srtm/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-DATADIR = $(PAPARAZZI_HOME)/conf/srtm_data
-Q=@
-
-SRTMData: $(DATADIR)/Africa $(DATADIR)/Australia $(DATADIR)/Eurasia $(DATADIR)/Islands $(DATADIR)/North_America $(DATADIR)/South_America
-
-clean:
-	
-
-$(DATADIR):
-	mkdir $(DATADIR)
-
-$(DATADIR)/Africa: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-$(DATADIR)/Australia: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-$(DATADIR)/Eurasia: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-$(DATADIR)/Islands: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-$(DATADIR)/North_America: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-$(DATADIR)/South_America: $(DATADIR)
-	wget -O $(@) http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(@F)
-
-.SUFFIXES: .hgt.zip
-
-%.hgt.zip: SRTMData
-	$(Q)wget -c -nv -N http://dds.cr.usgs.gov/srtm/version2_1/SRTM3/$(shell grep -l $(@F) $(DATADIR)/* | sed -e s#$(DATADIR)/##)/$(@F)
-
-