diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index f4571d1..d3fd23b 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-tag nfc-emulate-uid nfc-poll nfc-relay)
+SET(EXAMPLES-SOURCES nfc-anticol nfc-dep-initiator nfc-dep-target nfc-emulate-forum-tag2 nfc-emulate-tag nfc-emulate-uid nfc-poll nfc-relay)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libnfc)
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 627ed4d..db402e5 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -4,6 +4,7 @@ bin_PROGRAMS = \
 		nfc-anticol \
 		nfc-dep-initiator \
 		nfc-dep-target \
+		nfc-emulate-forum-tag2 \
 		nfc-emulate-tag \
 		nfc-emulate-uid \
 		nfc-poll \
@@ -33,6 +34,10 @@ nfc_relay_SOURCES = nfc-relay.c
 nfc_relay_LDADD = $(top_builddir)/libnfc/libnfc.la \
 		  $(top_builddir)/utils/libnfcutils.la
 
+nfc_emulate_forum_tag2_SOURCES = nfc-emulate-forum-tag2.c
+nfc_emulate_forum_tag2_LDADD = $(top_builddir)/libnfc/libnfc.la \
+			$(top_builddir)/utils/libnfcutils.la
+
 nfc_emulate_tag_SOURCES = nfc-emulate-tag.c
 nfc_emulate_tag_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			$(top_builddir)/utils/libnfcutils.la
diff --git a/utils/nfc-emulate-forum-tag2.c b/examples/nfc-emulate-forum-tag2.c
similarity index 99%
rename from utils/nfc-emulate-forum-tag2.c
rename to examples/nfc-emulate-forum-tag2.c
index 04e274c..c514152 100644
--- a/utils/nfc-emulate-forum-tag2.c
+++ b/examples/nfc-emulate-forum-tag2.c
@@ -69,7 +69,7 @@
 #include <nfc/nfc.h>
 #include <nfc/nfc-emulation.h>
 
-#include "nfc-utils.h"
+#include "utils/nfc-utils.h"
 
 static nfc_device *pnd;
 
diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index c96d2e7..30ea767 100644
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -1,4 +1,4 @@
-SET(UTILS-SOURCES nfc-emulate-forum-tag2 nfc-emulate-forum-tag4 nfc-list nfc-relay-picc nfc-mfclassic nfc-mfultralight)
+SET(UTILS-SOURCES nfc-emulate-forum-tag4 nfc-list nfc-relay-picc nfc-mfclassic nfc-mfultralight)
 
 ADD_LIBRARY(nfcutils STATIC 
   nfc-utils.c
diff --git a/utils/Makefile.am b/utils/Makefile.am
index b4b1c3e..49ec624 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,4 @@
 bin_PROGRAMS = \
-		nfc-emulate-forum-tag2 \
 		nfc-emulate-forum-tag4 \
 		nfc-list \
 		nfc-mfclassic \
@@ -18,10 +17,6 @@ noinst_LTLIBRARIES = libnfcutils.la
 
 libnfcutils_la_SOURCES = nfc-utils.c
 
-nfc_emulate_forum_tag2_SOURCES = nfc-emulate-forum-tag2.c
-nfc_emulate_forum_tag2_LDADD = $(top_builddir)/libnfc/libnfc.la \
-			       libnfcutils.la
-
 nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c
 nfc_emulate_forum_tag4_LDADD = $(top_builddir)/libnfc/libnfc.la \
 			       libnfcutils.la