diff --git a/Makefile.am b/Makefile.am
index e1dac222c05a5fd274931d0f9e1f8c138fb592f8..71a64e3391a60d17a7fd6842e58e46bb75c084ff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
 httpdir = $(pkgpythondir)/http
+confddir = $(pkgpythondir)/confd
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -29,6 +30,7 @@ DIRS = \
 	lib/http \
 	lib/hypervisor \
 	lib/rapi \
+	lib/confd \
 	man \
 	qa \
 	scripts \
@@ -110,6 +112,8 @@ http_PYTHON = \
 	lib/http/client.py \
 	lib/http/server.py
 
+confd_PYTHON = \
+	lib/confd/__init__.py
 
 docrst = \
 	doc/admin.rst \
@@ -342,7 +346,7 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 srclinks: stamp-directories
 	set -e; \
 	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
-			$(rapi_PYTHON) $(http_PYTHON); do \
+			$(rapi_PYTHON) $(http_PYTHON) $(confd_PYTHON); do \
 		if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
 			$(LN_S) $(abs_top_srcdir)/$$i $$i; \
 		fi; \
diff --git a/lib/confd/__init__.py b/lib/confd/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..ecf3f248172ebb01caad88ce2c26cff32c75c5e3
--- /dev/null
+++ b/lib/confd/__init__.py
@@ -0,0 +1,25 @@
+#
+#
+
+# Copyright (C) 2009 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.
+
+
+"""Ganeti confd library
+
+"""
+