diff --git a/electron-builder.yml b/electron-builder.yml
index a8fc22f7..3c465a61 100644
--- a/electron-builder.yml
+++ b/electron-builder.yml
@@ -21,6 +21,7 @@ extraFiles:
   - dist/exe.gns3server/**
   - dist/ubridge/**
   - dist/vpcs/**
+  - dist/dynamips/**
 
 mac:
   category: public.app-category.developer-tools
diff --git a/local-server.js b/local-server.js
index cf3f9cb2..a8948c30 100644
--- a/local-server.js
+++ b/local-server.js
@@ -199,10 +199,16 @@ async function setPATHEnv() {
     path.join(__dirname, 'dist', 'vpcs'),
     path.join(path.dirname(app.getPath('exe')), 'dist', 'vpcs')
   ];
-  
+
+  const dynamipsLookup = [
+    path.join(__dirname, 'dist', 'dynamips'),
+    path.join(path.dirname(app.getPath('exe')), 'dist', 'dynamips')
+  ];
+
   // prevent adding duplicates
   let extra = [
-    ...vpcsLookup
+    ...vpcsLookup,
+    ...dynamipsLookup
   ].filter((dir) => {
     return process.env.PATH.indexOf(dir) < 0;
   });
diff --git a/scripts/build.py b/scripts/build.py
index fbd6114b..fadaf2f5 100644
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -58,6 +58,17 @@ DEPENDENCIES = {
                 'vpcs.exe'
             ]
         }
+    },
+    'dynamips': {
+        'releases': 'https://api.github.com/repos/GNS3/dynamips/releases',
+        'version': '0.2.17',
+        'files': {
+            'windows': [
+                'cygwin1.dll',
+                'dynamips.exe',
+                'nvram_export.exe'
+            ]
+        }
     }
 }