diff --git a/sw/tools/airframe_editor/airframe_editor.py b/sw/tools/airframe_editor/airframe_editor.py
index 3c5eacc4218..074c6e3f12c 100755
--- a/sw/tools/airframe_editor/airframe_editor.py
+++ b/sw/tools/airframe_editor/airframe_editor.py
@@ -19,7 +19,7 @@
                         '../../../')))
 
 # Directories
-paparazzi_airframes = path.join(paparazzi_home, "conf/firmwares/")
+paparazzi_firmwares = path.join(paparazzi_home, "conf/firmwares/")
 paparazzi_modules   = path.join(paparazzi_home, "conf/modules/")
 paparazzi_airframes = path.join(paparazzi_home, "conf/airframes/")
 
@@ -46,11 +46,11 @@ def organize_airframe_xml(self):
 
 
     def find_firmwares(self, widget):
-        list_of_firmwares = glob.glob( path.join( paparazzi_airframes, "*.makefile") )
+        list_of_firmwares = glob.glob( path.join( paparazzi_firmwares, "*.makefile") )
         list_of_firmwares.sort()
         self.combo.get_model().clear();
         for firm in list_of_firmwares:
-            self.combo.append_text( firm.replace(".makefile","").replace(paparazzi_airframes, "") )
+            self.combo.append_text( firm.replace(".makefile","").replace(paparazzi_firmwares, "") )
 
     def find_modules(self, widget):
         list_of_modules = glob.glob( paparazzi_modules + "*.xml" )
diff --git a/sw/tools/airframe_editor/paparazzi.py b/sw/tools/airframe_editor/paparazzi.py
new file mode 100755
index 00000000000..38a54755a20
--- /dev/null
+++ b/sw/tools/airframe_editor/paparazzi.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+from __future__ import print_function
+
+import glob
+from os import path, getenv
+
+# if PAPARAZZI_HOME not set, then assume the tree containing this
+# file is a reasonable substitute
+paparazzi_home = getenv("PAPARAZZI_HOME", path.normpath(path.join(
+                        path.dirname(path.abspath(__file__)),
+                        '../../../')))
+
+# Directories
+paparazzi_firmwares = path.join(paparazzi_home, "conf/firmwares/")
+paparazzi_modules   = path.join(paparazzi_home, "conf/modules/")
+paparazzi_airframes = path.join(paparazzi_home, "conf/airframes/")
+
+