diff --git a/ChangeLog b/ChangeLog
index df4168e..71cbee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-28  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/extern/Makefile.am:
+	  Hopefully fix both make and make distcheck.
+
 2011-10-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/test/Makefile.am:
diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
index 6b0a299..fb970ee 100644
--- a/morituri/extern/Makefile.am
+++ b/morituri/extern/Makefile.am
@@ -36,9 +36,11 @@ musicbrainzngs_PYTHON = \
 
 EXTRA_DIST = log/test_log.py command/test_command.py command/help2man.py
 
+musicbrainzngs/musicbrainz.py: all
+
 python-musicbrainz-ngs:
+	pwd
 	git clone https://github.com/thomasvs/python-musicbrainz-ngs.git
 
-$(top_srcdir)/musicbrainzngs/musicbrainz.py: python-musicbrainz-ngs
-
-all: musicbrainzngs/musicbrainz.py
+all:
+	if test ! -e $(top_srcdir)/morituri/extern/musicbrainzngs/musicbrainz.py; then cloning python-musicbrainz-ngs; make python-musicbrainz-ngs; fi