diff --git a/server/plugins-available/bind_dlz_plugin.inc.php b/docs/old_server_plugins/bind_dlz_plugin.inc.php
similarity index 100%
rename from server/plugins-available/bind_dlz_plugin.inc.php
rename to docs/old_server_plugins/bind_dlz_plugin.inc.php
diff --git a/server/plugins-available/nginx_reverseproxy_plugin.inc.php b/docs/old_server_plugins/nginx_reverseproxy_plugin.inc.php
similarity index 100%
rename from server/plugins-available/nginx_reverseproxy_plugin.inc.php
rename to docs/old_server_plugins/nginx_reverseproxy_plugin.inc.php
diff --git a/install/patches/upd_0099.php b/install/patches/upd_0099.php
new file mode 100644
index 0000000000000000000000000000000000000000..137722f8e680cdae38ed2728159e6108ab174a14
--- /dev/null
+++ b/install/patches/upd_0099.php
@@ -0,0 +1,18 @@
+<?php
+
+if(!defined('INSTALLER_RUN')) die('Patch update file access violation.');
+
+class upd_0099 extends installer_patch_update {
+
+	public function onAfterSQL() {
+		global $inst;
+
+        // Remove old server plugins, unless they are currently enabled
+        if(!is_link('/usr/local/ispconfig/server/plugins-enabled/nginx_reverseproxy_plugin.inc.php'))
+            unlink('/usr/local/ispconfig/server/plugins-available/nginx_reverseproxy_plugin.inc.php');
+        if(!is_link('/usr/local/ispconfig/server/plugins-enabled/bind_dlz_plugin.inc.php'))
+            unlink('/usr/local/ispconfig/server/plugins-available/bind_dlz_plugin.inc.php');
+		
+	}
+
+}