diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11c13e7..178ff4e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -175,6 +175,9 @@ if(WIN32)
 	target_link_libraries(klvwalk general Advapi32.lib) 
 endif(WIN32)
 
+add_executable(asdcp-hmac "asdcp-hmac.cpp")
+target_link_libraries(asdcp-hmac general libasdcp)
+
 add_executable(asdcp-test "asdcp-test.cpp")
 target_link_libraries(asdcp-test general libasdcp)
 if(WIN32)
@@ -254,7 +257,7 @@ endif()
 # add the install target
 install(TARGETS libkumu libasdcp libas02 EXPORT asdcplibtargets RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib INCLUDES DESTINATION "${install_includes}")
 
-set(install_targets blackwave wavesplit klvwalk asdcp-test asdcp-wrap asdcp-unwrap asdcp-info asdcp-util j2c-test as-02-wrap as-02-wrap-iab as-02-unwrap as-02-info kmfilegen kmuuidgen kmrandgen)
+set(install_targets blackwave wavesplit klvwalk asdcp-hmac asdcp-test asdcp-wrap asdcp-unwrap asdcp-info asdcp-util j2c-test as-02-wrap as-02-wrap-iab as-02-unwrap as-02-info kmfilegen kmuuidgen kmrandgen)
 
 if (USE_ASDCP_JXS)
 	list(APPEND install_targets as-02-wrap-jxs)
diff --git a/src/Makefile.am b/src/Makefile.am
index 20bccf5..aa71bdc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -203,6 +203,7 @@ bin_PROGRAMS = \
 	asdcp-util \
 	asdcp-info \
 	asdcp-test \
+	asdcp-hmac \
 	j2c-test \
 	blackwave \
 	pinkwave \
@@ -229,6 +230,9 @@ bin_PROGRAMS += \
 endif
 
 # sources and linkage for CLI utilities
+asdcp_hmac_SOURCES = asdcp-hmac.cpp
+asdcp_hmac_LDADD = libasdcp.la libkumu.la
+
 asdcp_test_SOURCES = asdcp-test.cpp
 asdcp_test_LDADD = libasdcp.la libkumu.la