diff --git a/CHANGES b/CHANGES
index 6a73815..6f20ae6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
+apg-1.2.13
+    Added support for NetBSD.
+    (Thanks to Tomasz Luchowski <zuntum@eik.pl>).
+
 apg-1.2.12
-    Added support for AIX, and some compatibility reports
+    Added support for AIX, and some compatibility reports.
+    (Thanks to Philip Le Riche <pleriche@uk03.bull.co.uk>).
 
 apg-1.2.11
     Changed default owner of apg and apgd (now it is root).
@@ -13,7 +18,7 @@ apg-1.2.1b
     before compilation.
     Added option -M for new style password modes specification.
     (see apg(1) apgd(8)).
-    Added support for IRIX
+    Added support for IRIX.
     (Thanks to Andrew J. Caird <acaird@advance-inc.com>)
 
 apg-1.2.1a2
diff --git a/README b/README
index 10ea634..dabea23 100644
--- a/README
+++ b/README
@@ -1,6 +1,7 @@
-APG v1.2.12 was tested and found working on:
+APG v1.2.13 was tested and found working on:
 
    i386 FreeBSD 4.0-RELEASE
+   NetBSD (reported by Tomasz Luchowski <zuntum@eik.pl>)
    i386 Linux-Mandrake 6.0
    i386 Linux-Redhat 7.0
    i386 Linux-Mandrake 7.2 (reported by Andrew J. Caird <acaird@advance-inc.com>)
diff --git a/THANKS b/THANKS
index 8f318d8..c082f28 100644
--- a/THANKS
+++ b/THANKS
@@ -7,4 +7,5 @@ Peter Pentchev <roam@orbitel.bg>
 Adrian Ho <lexfiend@usa.net>
 Andrew J. Caird <acaird@advance-inc.com>
 Alexander J Pierce <apierce@boi.hp.com>
-Philip Le Riche <pleriche@uk03.bull.co.uk>
\ No newline at end of file
+Philip Le Riche <pleriche@uk03.bull.co.uk>
+Tomasz Luchowski <zuntum@eik.pl>
diff --git a/apg.c b/apg.c
index 52fd4e7..3a9b29e 100644
--- a/apg.c
+++ b/apg.c
@@ -35,14 +35,21 @@
 #include <strings.h>
 #include <string.h>
 #include <time.h>
+
+#ifdef __NetBSD__
+#include <unistd.h>
+#endif
+
 #define MAX_MODE_LENGTH   5
 
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE
 #endif
 
+#ifndef __NetBSD__
 #include <unistd.h>
-/*#include <crypt.h>*/
+#endif
+
 #ifdef __CYGWIN__
 #include <getopt.h>
 #undef APG_USE_CRYPT
@@ -220,7 +227,7 @@ main (int argc, char *argv[])
 #endif /* CLISERV */
      case 'v': /* print version */
       printf ("APG (Automated Password Generator)");
-      printf ("\nversion 1.2.11");
+      printf ("\nversion 1.2.13");
       printf ("\nCopyright (c) 1999, 2000, 2001 Adel I. Mirzazhanov\n");
       return (0);
      default: /* print help end exit */