diff --git a/.gitmodules b/.gitmodules
index 5d78529e..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/vfsStream"]
-	path = lib/vfsStream
-	url = git://github.com/mikey179/vfsStream.git
diff --git a/lib/vfsStream b/lib/vfsStream
deleted file mode 160000
index 371d0642..00000000
--- a/lib/vfsStream
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 371d06423604a8f3fd3dfc68cff235c32652d6e6
diff --git a/modman b/modman
index f761c4d3..b3d40f2a 100644
--- a/modman
+++ b/modman
@@ -3,7 +3,7 @@ app/etc/modules/*.xml                   app/etc/modules/
 app/code/community/EcomDev/*            app/code/community/EcomDev/
 lib/EcomDev/*                           lib/EcomDev/
 lib/Spyc                                lib/Spyc
-lib/vfsStream                           lib/vfsStream
+vendor/mikey179/vfsStream               lib/vfsStream
 shell/*.php                             shell/
 
 # Run shell installer