diff --git a/pkgs/applications/emulators/dynamips/default.nix b/pkgs/by-name/dy/dynamips/package.nix
similarity index 56%
rename from pkgs/applications/emulators/dynamips/default.nix
rename to pkgs/by-name/dy/dynamips/package.nix
index 1abc0dcf5236..77f662acb6e1 100644
--- a/pkgs/applications/emulators/dynamips/default.nix
+++ b/pkgs/by-name/dy/dynamips/package.nix
@@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, libelf
-, libpcap
-, nix-update-script
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  libelf,
+  libpcap,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,30 +14,40 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "GNS3";
-    repo = pname;
-    rev = "v${version}";
+    repo = "dynamips";
+    rev = "refs/tags/v${version}";
     hash = "sha256-+h+WsZ/QrDd+dNrR6CJb2uMG+vbUvK8GTxFJZOxknL0=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ libelf libpcap ];
 
-  cmakeFlags = [ "-DDYNAMIPS_CODE=stable" ];
+  buildInputs = [
+    libelf
+    libpcap
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "DYNAMIPS_CODE" "stable")
+  ];
 
   passthru = {
     updateScript = nix-update-script { };
   };
 
   meta = with lib; {
-    inherit (src.meta) homepage;
     description = "Cisco router emulator";
     longDescription = ''
       Dynamips is an emulator computer program that was written to emulate Cisco
       routers.
     '';
+    homepage = "https://github.com/GNS3/dynamips";
+    changelog = "https://github.com/GNS3/dynamips/releases/tag/v${version}";
     license = licenses.gpl2Plus;
     mainProgram = "dynamips";
-    maintainers = with maintainers; [ primeos ];
+    maintainers = with maintainers; [
+      primeos
+      anthonyroussel
+    ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ccad3925b745..5dc549019919 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2545,8 +2545,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.frameworks) AudioUnit Carbon Cocoa;
   };
 
-  dynamips = callPackage ../applications/emulators/dynamips { };
-
   fceux = libsForQt5.callPackage ../applications/emulators/fceux { };
 
   firebird-emu = libsForQt5.callPackage ../applications/emulators/firebird-emu { };