diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index fa7d08e..405c083 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -267,7 +267,7 @@ def musicbrainz(discid, country=None, record=False):
     @rtype: list of L{DiscMetadata}
     """
     log.debug('musicbrainz', 'looking up results for discid %r', discid)
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainzngs
 
     ret = []
 
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 082dc4a..599cfd3 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -33,7 +33,7 @@ from morituri.program import cdrdao, cdparanoia
 from morituri.image import image
 
 from morituri.extern.task import task, gstreamer
-from morituri.extern.musicbrainzngs import musicbrainz
+import musicbrainzngs
 
 
 # FIXME: should Program have a runner ?
diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
index 327739b..68bdce4 100644
--- a/morituri/extern/Makefile.am
+++ b/morituri/extern/Makefile.am
@@ -34,20 +34,10 @@ task_PYTHON = \
 	task/taskgtk.py \
 	task/gstreamer.py
 
-musicbrainzngsdir = $(PYTHONLIBDIR)/morituri/extern/musicbrainzngs
-
-musicbrainzngs_PYTHON = \
-	musicbrainzngs/__init__.py \
-	musicbrainzngs/musicbrainz.py \
-	musicbrainzngs/mbxml.py
-
-
 EXTRA_DIST = python-command/scripts/help2man
 
 log:
 	make git-submodule
-musicbrainzngs:
-	make git-submodule
 
 git-submodule:
 	cd $(top_srcdir) && git submodule init && git submodule sync && git submodule update
@@ -55,4 +45,3 @@ git-submodule:
 .PHONY: git-submodule
 
 
-all-local: log musicbrainzngs
diff --git a/morituri/extern/musicbrainzngs b/morituri/extern/musicbrainzngs
deleted file mode 120000
index 4040121..0000000
--- a/morituri/extern/musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainz-ngs/musicbrainzngs
\ No newline at end of file
diff --git a/morituri/extern/python-musicbrainz-ngs b/morituri/extern/python-musicbrainz-ngs
deleted file mode 160000
index 4260ed5..0000000
--- a/morituri/extern/python-musicbrainz-ngs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4260ed51273babb909a27fe07d68923158d2e9ec
diff --git a/morituri/rip/main.py b/morituri/rip/main.py
index fc5b758..3358df8 100644
--- a/morituri/rip/main.py
+++ b/morituri/rip/main.py
@@ -35,7 +35,7 @@ def main(argv):
     h.validate()
 
     # set user agent
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainzngs
     musicbrainz.set_useragent("morituri", configure.version,
         'https://thomas.apestaart.org/morituri/trac')