diff --git a/examples/Makefile.am b/examples/Makefile.am
index 273c464..8dc9abf 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -85,6 +85,7 @@ dist_man_MANS = \
 		nfc-list.1 \
 		nfc-mfclassic.1 \
 		nfc-mfultralight.1 \
+		nfc-poll.1 \
 		nfc-relay.1 \
 		pn53x-diagnose.1 \
 		pn53x-sam.1
diff --git a/examples/nfc-poll.1 b/examples/nfc-poll.1
new file mode 100644
index 0000000..8d629a6
--- /dev/null
+++ b/examples/nfc-poll.1
@@ -0,0 +1,28 @@
+.TH NFC-POLL 1 "June 26, 2009"
+.SH NAME
+nfc-poll \- Poll for one NFC target
+.SH SYNOPSIS
+.B nfc-poll
+.SH DESCRIPTION
+.B nfc-poll
+is a utility for polling any available target using ISO14443-A, FeliCa, Jewel
+and ISO14443-B modulations.
+
+This tool relies on a hardware polling feature of the PN532, it will display
+available information retrived from the tag.
+
+.SH BUGS
+Please report any bugs on the
+.B libnfc
+forum at
+.BR http://www.libnfc.org/community/ "."
+.SH LICENCE
+.B libnfc
+and
+.B libnfc-examples
+are covered by the GNU Lesser General Public License (LGPL), version 3.
+.SH AUTHORS
+Romuald Conty <romuald@libnfc.org>>
+.PP
+This manual page was written by Romuald Conty <romuald@libnfc.org>>.
+It is licensed under the terms of the GNU GPL (version 2 or later).
diff --git a/examples/nfc-poll.c b/examples/nfc-poll.c
index ad557cd..29982d6 100644
--- a/examples/nfc-poll.c
+++ b/examples/nfc-poll.c
@@ -97,15 +97,6 @@ main (int argc, const char *argv[])
       nfc_perror (pnd, "nfc_configure");
       exit (EXIT_FAILURE);
     }
-    // Configure the CRC and Parity settings
-    if (!nfc_configure (pnd, NDO_HANDLE_CRC, true)) {
-      nfc_perror (pnd, "nfc_configure");
-      exit (EXIT_FAILURE);
-    }
-    if (!nfc_configure (pnd, NDO_HANDLE_PARITY, true)) {
-      nfc_perror (pnd, "nfc_configure");
-      exit (EXIT_FAILURE);
-    }
     // Enable field so more power consuming cards can power themselves up
     if (!nfc_configure (pnd, NDO_ACTIVATE_FIELD, true)) {
       nfc_perror (pnd, "nfc_configure");
@@ -114,7 +105,7 @@ main (int argc, const char *argv[])
 
     printf ("Connected to NFC reader: %s\n", pnd->acName);
 
-    printf ("PN53x will poll during %ld ms\n", (unsigned long) btPollNr * szTargetTypes * btPeriod * 150);
+    printf ("PN532 will poll during %ld ms\n", (unsigned long) btPollNr * szTargetTypes * btPeriod * 150);
     res = nfc_initiator_poll_targets (pnd, nttArray, szTargetTypes, btPollNr, btPeriod, antTargets, &szTargetFound);
     if (res) {
       uint8_t n;