diff --git a/configure.ac b/configure.ac
index 99bfd075f682da9f4cd977d3cdc0cb8cda46bee7..bc655155dc15f8d56458dd08d747b431730fc191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,6 +416,7 @@ AC_CONFIG_FILES([
   deps/libyaml/include/Makefile
   deps/libyaml/src/Makefile
   deps/libcyaml/Makefile
+  deps/c-timestamp/Makefile
 ])
 
 dnl AC_SUBST does not preserve executable bit on scripts, so do
diff --git a/deps/Makefile.am b/deps/Makefile.am
index 818341312e0521700208e7a35153a79f5930457a..03887850da2a21f43b9c46a601e671ddc3fb3e5b 100644
--- a/deps/Makefile.am
+++ b/deps/Makefile.am
@@ -28,7 +28,7 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
-SUBDIRS = libyaml libcyaml mamba packcc .
+SUBDIRS = libyaml libcyaml mamba packcc c-timestamp .
 
 # dist by default would pick up SUBDIRS and all conditional additions. But some don't have a Makefile at that time, so we need to split things up
 DIST_SUBDIRS = $(SUBDIRS)
diff --git a/deps/c-timestamp/Makefile.am b/deps/c-timestamp/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..db0c3fe290ff8e66f1ca9a8a3d2f3f35ed3b4d7f
--- /dev/null
+++ b/deps/c-timestamp/Makefile.am
@@ -0,0 +1,9 @@
+noinst_LTLIBRARIES = libtimestamp.la
+
+libtimestamp_la_SOURCES=    \
+	timestamp_compare.c \
+	timestamp_format.c  \
+	timestamp_parse.c   \
+	timestamp_valid.c   \
+	timestamp_tm.c      \
+        timestamp.h
diff --git a/deps/c-timestamp/Makefile b/deps/c-timestamp/Makefile.upstream
similarity index 100%
rename from deps/c-timestamp/Makefile
rename to deps/c-timestamp/Makefile.upstream