diff --git a/libs/vamp-sdk/plugins/AmplitudeFollower.cpp b/libs/vamp-plugins/AmplitudeFollower.cpp
similarity index 100%
rename from libs/vamp-sdk/plugins/AmplitudeFollower.cpp
rename to libs/vamp-plugins/AmplitudeFollower.cpp
diff --git a/libs/vamp-sdk/plugins/AmplitudeFollower.h b/libs/vamp-plugins/AmplitudeFollower.h
similarity index 100%
rename from libs/vamp-sdk/plugins/AmplitudeFollower.h
rename to libs/vamp-plugins/AmplitudeFollower.h
diff --git a/libs/vamp-sdk/plugins/PercussionOnsetDetector.cpp b/libs/vamp-plugins/PercussionOnsetDetector.cpp
similarity index 100%
rename from libs/vamp-sdk/plugins/PercussionOnsetDetector.cpp
rename to libs/vamp-plugins/PercussionOnsetDetector.cpp
diff --git a/libs/vamp-sdk/plugins/PercussionOnsetDetector.h b/libs/vamp-plugins/PercussionOnsetDetector.h
similarity index 100%
rename from libs/vamp-sdk/plugins/PercussionOnsetDetector.h
rename to libs/vamp-plugins/PercussionOnsetDetector.h
diff --git a/libs/vamp-plugins/SConscript b/libs/vamp-plugins/SConscript
new file mode 100644
index 0000000000..592fca3768
--- /dev/null
+++ b/libs/vamp-plugins/SConscript
@@ -0,0 +1,26 @@
+# -*- python -*-
+
+import os
+import os.path
+import glob
+
+plugin_files = glob.glob ("*.cpp")
+
+Import('env install_prefix libraries')
+vampplugs = env.Copy()
+
+vampplugs.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk")
+vampplugs.Merge ([libraries['vamp'],
+                  libraries['vamphost']
+                  ])
+
+libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', plugin_files)
+
+Default(libvampplugins)
+
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins))
+
+env.Alias('tarball', env.Distribute (env['DISTTREE'],
+                                     [ 'SConscript', 'COPYING', 'README' ] +
+                                     plugin_files +
+                                     glob.glob('*.h')))
diff --git a/libs/vamp-sdk/plugins/SpectralCentroid.cpp b/libs/vamp-plugins/SpectralCentroid.cpp
similarity index 100%
rename from libs/vamp-sdk/plugins/SpectralCentroid.cpp
rename to libs/vamp-plugins/SpectralCentroid.cpp
diff --git a/libs/vamp-sdk/plugins/SpectralCentroid.h b/libs/vamp-plugins/SpectralCentroid.h
similarity index 100%
rename from libs/vamp-sdk/plugins/SpectralCentroid.h
rename to libs/vamp-plugins/SpectralCentroid.h
diff --git a/libs/vamp-sdk/plugins/ZeroCrossing.cpp b/libs/vamp-plugins/ZeroCrossing.cpp
similarity index 100%
rename from libs/vamp-sdk/plugins/ZeroCrossing.cpp
rename to libs/vamp-plugins/ZeroCrossing.cpp
diff --git a/libs/vamp-sdk/plugins/ZeroCrossing.h b/libs/vamp-plugins/ZeroCrossing.h
similarity index 100%
rename from libs/vamp-sdk/plugins/ZeroCrossing.h
rename to libs/vamp-plugins/ZeroCrossing.h
diff --git a/libs/vamp-sdk/plugins/plugins.cpp b/libs/vamp-plugins/plugins.cpp
similarity index 100%
rename from libs/vamp-sdk/plugins/plugins.cpp
rename to libs/vamp-plugins/plugins.cpp
diff --git a/libs/vamp-sdk/SConscript b/libs/vamp-sdk/SConscript
index f8a25112a1..f6a27288f9 100644
--- a/libs/vamp-sdk/SConscript
+++ b/libs/vamp-sdk/SConscript
@@ -19,8 +19,6 @@ vamp-sdk/hostext/PluginWrapper.cpp
 vamp-sdk/RealTime.cpp
 """)
 
-plugin_files = glob.glob ("plugins/*.cpp")
-
 Import('env install_prefix libraries')
 vampsdk = env.Copy()
 
@@ -28,22 +26,17 @@ vampsdk.Append (CPPATH='#libs/vamp-sdk/vamp', CXXFLAGS="-Ilibs/vamp-sdk")
 
 libvampsdk = vampsdk.SharedLibrary('vampsdk', vampsdk_files)
 libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
-libvampplugins = vampsdk.SharedLibrary('ardourvampplugins', plugin_files)
 
 Default(libvampsdk)
 Default(libvamphostsdk)
-Default(libvampplugins)
 
 env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvampsdk))
 env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvamphostsdk))
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'COPYING', 'README' ] +
                                      vampsdk_files +
                                      vamphostsdk_files +
-                                     plugin_files +
                                      glob.glob('vamp/*.h') + 
-                                     glob.glob('plugins/*.h') + 
                                      glob.glob('vamp-sdk/*.h') + 
                                      glob.glob('vamp-sdk/hostext/*.h')))