diff --git a/Makefile.am b/Makefile.am
index fa3a0a5d370eac1d2af95c1a1612ff4bb2f2a782..def0e725f79e2241fbe3e2ae4fe994f108d6dc36 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,3 +15,6 @@ depgraph.ps: depgraph.dot
 depgraph.dot: ganeti/*.py
 	pylint.python2.4 --indent-string '  ' --rcfile=/dev/null \
 	  --reports y --int-import-graph $@ --persistent n ganeti >/dev/null
+
+install-exec-local:
+	@mkdir_p@ ${localstatedir}/lib/ganeti ${localstatedir}/log/ganeti
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index a884489b3e4ef5b99f703175dbc37e0f517518f4..c726bf15d7b984c7534472869b51dfb4c809313d 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -580,7 +580,8 @@ class LUInitCluster(LogicalUnit):
     result = utils.RunCmd(["ip", "link", "show", "dev", self.op.master_netdev])
     if result.failed:
       raise errors.OpPrereqError("Invalid master netdev given (%s): '%s'" %
-                                 (self.op.master_netdev, result.output))
+                                 (self.op.master_netdev,
+                                  result.output.strip()))
 
   def Exec(self, feedback_fn):
     """Initialize the cluster.
diff --git a/testing/Makefile.am b/testing/Makefile.am
index 115bce2352f90745374bbcc31943b2adcb7b1f3a..732c182f5447a0c5964feae1435b05630f59ff65 100644
--- a/testing/Makefile.am
+++ b/testing/Makefile.am
@@ -6,4 +6,4 @@ ganeti:
 	rm -f ganeti
 	ln -s $(top_srcdir)/lib ganeti
 
-EXTRA_DIST = $(TESTS) fake_config.py ganeti.qa.py qa-sample.yaml
+EXTRA_DIST = $(TESTS) mocks.py ganeti.qa.py qa-sample.yaml