diff --git a/projects/hip/CMakeLists.txt b/projects/hip/CMakeLists.txt
index bbd9b3b6fa..8bf1b0c3b8 100644
--- a/projects/hip/CMakeLists.txt
+++ b/projects/hip/CMakeLists.txt
@@ -245,13 +245,24 @@ set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_base)
 configure_file(packaging/hip_base.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
 configure_file(packaging/hip_base.postinst ${BUILD_DIR}/postinst @ONLY)
 configure_file(packaging/hip_base.prerm ${BUILD_DIR}/prerm @ONLY)
-add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} .
-    COMMAND rm -rf *.deb *.rpm *.tar.gz
-    COMMAND make package
-    COMMAND cp *.deb ${PROJECT_BINARY_DIR}
-    COMMAND cp *.rpm ${PROJECT_BINARY_DIR}
-    COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR}
-    WORKING_DIRECTORY ${BUILD_DIR})
+if(NOT BUILD_HIPIFY_CLANG)
+    add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} .
+        COMMAND rm -rf *.deb *.rpm *.tar.gz
+        COMMAND make package
+        COMMAND cp *.deb ${PROJECT_BINARY_DIR}
+        COMMAND cp *.rpm ${PROJECT_BINARY_DIR}
+        COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR}
+        WORKING_DIRECTORY ${BUILD_DIR})
+else()
+    add_custom_target(pkg_hip_base COMMAND ${CMAKE_COMMAND} .
+        COMMAND rm -rf *.deb *.rpm *.tar.gz
+        COMMAND make package
+        COMMAND cp *.deb ${PROJECT_BINARY_DIR}
+        COMMAND cp *.rpm ${PROJECT_BINARY_DIR}
+        COMMAND cp *.tar.gz ${PROJECT_BINARY_DIR}
+        WORKING_DIRECTORY ${BUILD_DIR}
+        DEPENDS hipify-clang)
+endif()
 
 # Package: hip_hcc
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/hip_hcc)
diff --git a/projects/hip/hipify-clang/CMakeLists.txt b/projects/hip/hipify-clang/CMakeLists.txt
index 6a5f30e2d1..14dc9c5d17 100644
--- a/projects/hip/hipify-clang/CMakeLists.txt
+++ b/projects/hip/hipify-clang/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.8)
 project(hipify-clang)
 
+set(BUILD_HIPIFY_CLANG 0 PARENT_SCOPE)
+
 # Find LLVM package
 find_package(LLVM 3.8 QUIET PATHS ${HIPIFY_CLANG_LLVM_DIR} NO_DEFAULT_PATH)
 if (NOT ${LLVM_FOUND})
@@ -73,6 +75,8 @@ else()
     add_custom_target(test-hipify-clang)
     add_dependencies(test-hipify-clang test-hipify)
     set_target_properties(test-hipify-clang PROPERTIES FOLDER "Tests")
+
+    set(BUILD_HIPIFY_CLANG 1 PARENT_SCOPE)
 endif()
 
 # vim: ts=4:sw=4:expandtab:smartindent
diff --git a/projects/hip/packaging/hip_base.txt b/projects/hip/packaging/hip_base.txt
index 6f989d5636..8e02baca9b 100644
--- a/projects/hip/packaging/hip_base.txt
+++ b/projects/hip/packaging/hip_base.txt
@@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 2.8.3)
 project(hip_base)
 
 install(DIRECTORY @hip_SOURCE_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS)
+if(@BUILD_HIPIFY_CLANG@)
+    install(PROGRAMS @PROJECT_BINARY_DIR@/hipify-clang/hipify-clang DESTINATION bin)
+endif()
 install(DIRECTORY @hip_SOURCE_DIR@/include DESTINATION .)
 install(FILES @PROJECT_BINARY_DIR@/.version DESTINATION bin)
 install(DIRECTORY @hip_SOURCE_DIR@/cmake DESTINATION .)