diff --git a/configure.ac b/configure.ac
index a40dfb6a1..44703bf1e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,6 +542,7 @@ AC_CONFIG_FILES([Makefile
                  src/auditor/Makefile
                  src/auditordb/Makefile
                  src/bank-lib/Makefile
+                 src/curl/Makefile
                  src/exchange/Makefile
                  src/exchangedb/Makefile
                  src/exchange-tools/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 80fa40dbc..38bf715fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ pkgcfg_DATA = \
 EXTRA_DIST = \
   taler.conf
 
-SUBDIRS = include util wire json $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor
+SUBDIRS = include util wire json curl $(PQ_DIR) $(BANK_LIB) wire-plugins exchangedb exchange exchange-tools auditordb auditor
 if HAVE_LIBCURL
  SUBDIRS += lib benchmark
 else
diff --git a/src/bank-lib/Makefile.am b/src/bank-lib/Makefile.am
index 9ae27a447..1166964aa 100644
--- a/src/bank-lib/Makefile.am
+++ b/src/bank-lib/Makefile.am
@@ -41,10 +41,10 @@ libtalerbank_la_SOURCES = \
   bank_api_common.c bank_api_common.h \
   bank_api_history.c \
   bank_api_reject.c \
-  bank_api_parse.c \
-  ../lib/teah_common.c # FIXME: ugly hack!!
+  bank_api_parse.c
 libtalerbank_la_LIBADD = \
   $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/curl/libtalercurl.la \
   -lgnunetcurl \
   -lgnunetjson \
   -lgnunetutil \
diff --git a/src/lib/teah_common.c b/src/curl/curl.c
similarity index 100%
rename from src/lib/teah_common.c
rename to src/curl/curl.c
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fddc961f5..f5251524e 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -27,11 +27,11 @@ libtalerexchange_la_SOURCES = \
   exchange_api_reserve.c \
   exchange_api_track_transaction.c \
   exchange_api_track_transfer.c \
-  exchange_api_wire.c \
-  teah_common.c
+  exchange_api_wire.c
 libtalerexchange_la_LIBADD = \
   libtalerauditor.la \
   $(top_builddir)/src/json/libtalerjson.la \
+  $(top_builddir)/src/curl/libtalercurl.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetcurl \
   -lgnunetjson \
@@ -47,9 +47,9 @@ libtalerauditor_la_SOURCES = \
   auditor_api_curl_defaults.c auditor_api_curl_defaults.h \
   auditor_api_handle.c auditor_api_handle.h \
   auditor_api_deposit_confirmation.c \
-  auditor_api_exchanges.c \
-  teah_common.c
+  auditor_api_exchanges.c
 libtalerauditor_la_LIBADD = \
+  $(top_builddir)/src/curl/libtalercurl.la \
   $(top_builddir)/src/json/libtalerjson.la \
   $(top_builddir)/src/util/libtalerutil.la \
   -lgnunetcurl \