diff --git a/net-mgmt/kismet/Makefile b/net-mgmt/kismet/Makefile
index 561dda9dbba2..12eeed834c82 100644
--- a/net-mgmt/kismet/Makefile
+++ b/net-mgmt/kismet/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	kismet
-PORTVERSION=	200701.r1
+PORTVERSION=	200710.r1
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://www.kismetwireless.net/code/
-DISTNAME=	kismet-2007-01-R1b
+DISTNAME=	kismet-2007-10-R1
 
 MAINTAINER=	peter.thoenen@yahoo.com
 COMMENT=	802.11 layer2 wireless network detector, sniffer, and IDS
diff --git a/net-mgmt/kismet/distinfo b/net-mgmt/kismet/distinfo
index 7b61fd391165..fb0c60e7faa0 100644
--- a/net-mgmt/kismet/distinfo
+++ b/net-mgmt/kismet/distinfo
@@ -1,6 +1,6 @@
+MD5 (kismet-2007-10-R1.tar.gz) = 2100c667e69db0cde35fa2d06c8516e2
+SHA256 (kismet-2007-10-R1.tar.gz) = 023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
+SIZE (kismet-2007-10-R1.tar.gz) = 646452
 MD5 (kismet-2007-01-R1b.tar.gz) = a1dcea71f0c3f881ef72f5bca2db7b39
-SHA256 (kismet-2007-01-R1b.tar.gz) = 1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
-SIZE (kismet-2007-01-R1b.tar.gz) = 625585
-MD5 (gpsmap-gmap-0.1.tgz) = 7c62c841ccdc187812a0fe602d92d97c
 SHA256 (gpsmap-gmap-0.1.tgz) = 66c5e9c4fed70e88d092754746014bb02071b742c23390f1ec795fd14b32317b
 SIZE (gpsmap-gmap-0.1.tgz) = 13845
diff --git a/net-mgmt/kismet/files/patch-kismet-gpsmap.cc b/net-mgmt/kismet/files/patch-kismet-gpsmap.cc
new file mode 100644
index 000000000000..f3e7270fe615
--- /dev/null
+++ b/net-mgmt/kismet/files/patch-kismet-gpsmap.cc
@@ -0,0 +1,16 @@
+--- gpsmap.cc.orig	Mon Oct 15 15:13:32 2007
++++ gpsmap.cc	Mon Oct 15 15:15:19 2007
+@@ -2242,11 +2242,11 @@
+     pthread_attr_destroy(&attr);
+ 
+     // Now wait for the threads to complete and come back
+-    int thread_status;
++    intptr_t thread_status;
+     for (int t = 0; t < numthreads; t++) {
+         void *tmp;
+         pthread_join(mapthread[t], &tmp);
+-	thread_status = reinterpret_cast<int>(tmp);
++	thread_status = reinterpret_cast<intptr_t>(tmp);
+     }
+ #else
+     // Run one instance of our "thread".  thread number 0, it should just crunch it all