diff --git a/Makefile.am b/Makefile.am
index 116ddbe2f47cda4c87c34965f06a5586265d86aa..ecb83187c15467d6627ff3c879298c1b49c23457 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ bindir = $(versiondir)/$(BINDIR)
 sbindir = $(versiondir)$(SBINDIR)
 mandir = $(versionedsharedir)/root$(MANDIR)
 pkgpythondir = $(versionedsharedir)/ganeti
+pkgpython_rpc_stubdir = $(versionedsharedir)/ganeti/rpc/stub
 gntpythondir = $(versionedsharedir)
 pkgpython_bindir = $(versionedsharedir)
 gnt_python_sbindir = $(versionedsharedir)
@@ -87,6 +88,7 @@ masterddir = $(pkgpythondir)/masterd
 confddir = $(pkgpythondir)/confd
 rapidir = $(pkgpythondir)/rapi
 rpcdir = $(pkgpythondir)/rpc
+rpc_stubdir = $(pkgpythondir)/rpc/stub
 serverdir = $(pkgpythondir)/server
 watcherdir = $(pkgpythondir)/watcher
 impexpddir = $(pkgpythondir)/impexpd
@@ -177,6 +179,7 @@ DIRS = \
 	lib/masterd \
 	lib/rapi \
 	lib/rpc \
+	lib/rpc/stub \
 	lib/server \
 	lib/storage \
 	lib/tools \
@@ -474,6 +477,9 @@ rpc_PYTHON = \
 	lib/rpc/node.py \
 	lib/rpc/transport.py
 
+rpc_stub_PYTHON = \
+	lib/rpc/stub/__init__.py
+
 pytools_PYTHON = \
 	lib/tools/__init__.py \
 	lib/tools/burnin.py \
@@ -1589,6 +1595,7 @@ all_python_code = \
 	$(rapi_PYTHON) \
 	$(server_PYTHON) \
 	$(rpc_PYTHON) \
+	$(rpc_stub_PYTHON) \
 	$(pytools_PYTHON) \
 	$(http_PYTHON) \
 	$(confd_PYTHON) \
diff --git a/lib/rpc/stub/__init__.py b/lib/rpc/stub/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..90a6edfc2879b35222b91d62bd4be76af672877f
--- /dev/null
+++ b/lib/rpc/stub/__init__.py
@@ -0,0 +1,26 @@
+#
+#
+
+# Copyright (C) 2013 Google Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+
+"""Empty file for package definition.
+
+Files in this module are generated automatically from Haskell during
+compilation.
+"""