diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24c51e793a..e68b234a39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@ include_directories(
 	${CMAKE_BINARY_DIR}
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/epan
+	${CMAKE_SOURCE_DIR}/filetap
 	${CMAKE_SOURCE_DIR}/tools/lemon
 	${CMAKE_SOURCE_DIR}/wiretap
 )
@@ -649,12 +650,13 @@ endforeach()
 add_subdirectory( asn1 EXCLUDE_FROM_ALL )
 add_subdirectory( codecs )
 add_subdirectory( epan )
+add_subdirectory( filetap )
 add_subdirectory( tools/lemon )
 add_subdirectory( ui )
 add_subdirectory( wiretap )
 add_subdirectory( wsutil )
 
-add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libwiretap dumpabi-libwsutil color.h)
+add_custom_target(dumpabi DEPENDS dumpabi-libwireshark dumpabi-libfiletap dumpabi-libwiretap dumpabi-libwsutil color.h)
 
 if(ENABLE_ECHLD)
 	add_subdirectory( echld )
@@ -757,6 +759,7 @@ link_directories(
 	${CMAKE_BINARY_DIR}/ui/qt
 	${CMAKE_BINARY_DIR}/codecs
 	${CMAKE_BINARY_DIR}/epan
+	${CMAKE_BINARY_DIR}/filetap
 	${CMAKE_BINARY_DIR}/wiretap
 	${CMAKE_BINARY_DIR}/wsutil
 )
diff --git a/NEWS b/NEWS
index 48b241e97e..6281687e15 100644
--- a/NEWS
+++ b/NEWS
@@ -77,12 +77,12 @@ What's New
 
    802.1AE Secure tag, ASTERIX, ATN, BT 3DS, CARP, Cisco MetaData, ELF
    file format, EXPORTED PDU, FINGER, HTTP2, IDRP, ILP, Kafka, Kyoto
-   Tycoon binary protocol, MBIM, MiNT, MP4 / ISOBMFF file format, NXP
-   PN532 HCI, OpenFlow, Picture Transfer Protocol Over IP, QUIC (Quick UDP
-   Internet Connections), SEL RTAC (Real Time Automation Controller)
-   EIA-232 Serial-Line Dissection, Sippy RTPproxy, STANAG 4607, STANAG
-   5066 DTS, STANAG 5066 SIS, Tinkerforge, UDT, URL Encoded Form Data,
-   WHOIS, and Wi-Fi Display
+   Tycoon binary protocol, MBIM, MiNT, MP4 / ISOBMFF file format, Novell
+   PKIS certificate extensions, NXP PN532 HCI, OpenFlow, Picture Transfer
+   Protocol Over IP, QUIC (Quick UDP Internet Connections), SEL RTAC (Real
+   Time Automation Controller) EIA-232 Serial-Line Dissection, Sippy
+   RTPproxy, STANAG 4607, STANAG 5066 DTS, STANAG 5066 SIS, Tinkerforge,
+   UDT, URL Encoded Form Data, WHOIS, and Wi-Fi Display
 
   Updated Protocol Support
 
@@ -162,7 +162,7 @@ Frequently Asked Questions
    A complete FAQ is available on the [21]Wireshark web site.
      __________________________________________________________________
 
-   Last updated 2013-12-13 20:00:51 CET
+   Last updated 2013-12-31 15:25:28 CET
 
 References