diff --git a/net/hostapd/Makefile b/net/hostapd/Makefile
index 7b1bfb56dfea..3277d8346ea4 100644
--- a/net/hostapd/Makefile
+++ b/net/hostapd/Makefile
@@ -2,15 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=	hostapd
-PORTVERSION=	2.1
+PORTVERSION=	2.2
 CATEGORIES=	net
 MASTER_SITES=	http://hostap.epitest.fi/releases/
 
 MAINTAINER=	leres@ee.lbl.gov
 COMMENT=	IEEE 802.11 AP, IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator
 
-LICENSE=	GPLv2 BSD
-LICENSE_COMB=	dual
+LICENSE=	BSD3CLAUSE
 
 USES=		gmake
 BUILD_WRKSRC=	${WRKSRC}/${PORTNAME}
diff --git a/net/hostapd/distinfo b/net/hostapd/distinfo
index c4ce0b825698..2f64b3f8972c 100644
--- a/net/hostapd/distinfo
+++ b/net/hostapd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (hostapd-2.1.tar.gz) = 5c7110f55b6092e5277e26edc961eda2def12b94218129d116f5681e34bb2f88
-SIZE (hostapd-2.1.tar.gz) = 1490215
+SHA256 (hostapd-2.2.tar.gz) = f15b6bcb434378860ea5b88dffed7f54d8cb71fff2146de0f006977a5e25a882
+SIZE (hostapd-2.2.tar.gz) = 1586482