diff --git a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
index 1e3356d337..4d040ae245 100644
--- a/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
+++ b/hadoop-assemblies/src/main/resources/assemblies/hadoop-tools.xml
@@ -44,6 +44,11 @@
       </includes>
       <outputDirectory>lib/native</outputDirectory>
     </fileSet>
+    <fileSet>
+      <directory>../hadoop-pipes/target/native/examples</directory>
+      <outputDirectory>examples/bin</outputDirectory>
+      <fileMode>0755</fileMode>
+    </fileSet>
   </fileSets>
   <dependencySets>
     <dependencySet>
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 5fe4f0156d..ecfd613156 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -304,6 +304,9 @@ Branch-2 ( Unreleased changes )
 
     HADOOP-8538. CMake builds fail on ARM. (Trevor Robinson via eli)
 
+    HADOOP-8547. Package hadoop-pipes examples/bin directory (again).
+    (Colin Patrick McCabe via eli)
+
   BREAKDOWN OF HDFS-3042 SUBTASKS
 
     HADOOP-8220. ZKFailoverController doesn't handle failure to become active
diff --git a/hadoop-tools/hadoop-pipes/src/CMakeLists.txt b/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
index 0cd00602d2..a18022f868 100644
--- a/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
+++ b/hadoop-tools/hadoop-pipes/src/CMakeLists.txt
@@ -57,33 +57,25 @@ include_directories(
 # Example programs
 add_executable(wordcount-simple main/native/examples/impl/wordcount-simple.cc)
 target_link_libraries(wordcount-simple hadooppipes hadooputils)
+output_directory(wordcount-simple examples)
 
 add_executable(wordcount-part main/native/examples/impl/wordcount-part.cc)
 target_link_libraries(wordcount-part hadooppipes hadooputils)
+output_directory(wordcount-part examples)
 
 add_executable(wordcount-nopipe main/native/examples/impl/wordcount-nopipe.cc)
 target_link_libraries(wordcount-nopipe hadooppipes hadooputils)
+output_directory(wordcount-nopipe examples)
 
 add_executable(pipes-sort main/native/examples/impl/sort.cc)
 target_link_libraries(pipes-sort hadooppipes hadooputils)
-
-install(TARGETS wordcount-simple wordcount-part wordcount-nopipe pipes-sort 
-    RUNTIME DESTINATION bin
-)
+output_directory(pipes-sort examples)
 
 add_library(hadooputils STATIC
     main/native/utils/impl/StringUtils.cc
     main/native/utils/impl/SerialUtils.cc
 )
 
-install(FILES
-    main/native/utils/api/hadoop/SerialUtils.hh
-    main/native/utils/api/hadoop/StringUtils.hh
-    DESTINATION api/hadoop
-    COMPONENT headers
-)
-install(TARGETS hadooputils DESTINATION lib)
-
 add_library(hadooppipes STATIC
     main/native/pipes/impl/HadoopPipes.cc
 )
@@ -92,11 +84,3 @@ target_link_libraries(hadooppipes
     ${OPENSSL_LIBRARIES}
     pthread
 )
-
-install(FILES
-    main/native/pipes/api/hadoop/Pipes.hh
-    main/native/pipes/api/hadoop/TemplateFactory.hh
-    DESTINATION api/hadoop
-    COMPONENT headers
-)
-install(TARGETS hadooppipes DESTINATION lib)