diff --git a/.gitmodules b/.gitmodules
index 55652cd..335e732 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "src/templeton"]
 	path = src/templeton
 	url = git://github.com/wlach/templeton.git
-[submodule "src/mozbase"]
-	path = src/mozbase
-	url = git://github.com/mozilla/mozbase.git
 [submodule "src/tests/ep1"]
 	path = src/tests/ep1
 	url = git://wrla.ch/ep1.git
diff --git a/bootstrap.sh b/bootstrap.sh
index fcda932..4e1276d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -37,7 +37,6 @@ make -C src/videocapture/videocapture/decklink
 export PIP_DEFAULT_TIMEOUT=120
 
 # Install local deps
-$VENV/bin/python src/mozbase/setup_development.py
 $VENV/bin/pip install -e src/templeton
 $VENV/bin/pip install -e src/eideticker
 $VENV/bin/pip install -e src/videocapture
diff --git a/src/eideticker/setup.py b/src/eideticker/setup.py
index d3b4497..0ecbd80 100644
--- a/src/eideticker/setup.py
+++ b/src/eideticker/setup.py
@@ -4,7 +4,8 @@ setup(
     version="0.1.0",
     packages=find_packages(),
     install_requires=[
-        'mozdevice', 'BeautifulSoup', 'gaiatest>=0.21.3', 'httplib2',
-        'b2gpopulate>=0.12'])
+        'mozdevice>=0.31', 'mozlog>=1.5', 'mozprofile>=0.19',
+        'moznetwork>=0.24', 'mozhttpd>=0.7', 'BeautifulSoup',
+        'gaiatest>=0.21.3', 'httplib2', 'b2gpopulate>=0.12'])
 
 # FIXME: Compile decklink-capture script automatically
diff --git a/src/mozbase b/src/mozbase
deleted file mode 160000
index 50bcb04..0000000
--- a/src/mozbase
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 50bcb04fe88b053b16fa97833c252be439bed15e