diff --git a/Makefile.am b/Makefile.am
index 43c2fdcbed700c454bc4d84d6ace2c480f3125dc..feb2af9dea1f39f146139e6c89f0faf375ba4cc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -758,6 +758,7 @@ HS_LIB_SRCS = \
 	src/Ganeti/Utils.hs \
 	src/Ganeti/VCluster.hs \
 	src/Ganeti/WConfd/ConfigState.hs \
+	src/Ganeti/WConfd/Core.hs \
 	src/Ganeti/WConfd/Monad.hs
 
 HS_TEST_SRCS = \
diff --git a/src/Ganeti/WConfd/Core.hs b/src/Ganeti/WConfd/Core.hs
new file mode 100644
index 0000000000000000000000000000000000000000..bfcbda9a6707ac72aa5049a951946f2d9f69f17e
--- /dev/null
+++ b/src/Ganeti/WConfd/Core.hs
@@ -0,0 +1,45 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+{-| The Ganeti WConfd core functions.
+
+As TemplateHaskell require that splices be defined in a separate
+module, we combine all the TemplateHaskell functionality that HTools
+needs in this module (except the one for unittests).
+
+-}
+
+{-
+
+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.
+
+-}
+
+module Ganeti.WConfd.Core where
+
+import Language.Haskell.TH (Name)
+
+import Ganeti.WConfd.Monad
+
+-- * The list of all functions exported to RPC.
+
+-- Just a test function
+echo :: String -> WConfdMonad String
+echo = return
+
+exportedFunctions :: [Name]
+exportedFunctions = [ 'echo ]