diff --git a/net/bredbandskollen/Makefile b/net/bredbandskollen/Makefile
index 896e7c58d731..4c43dba8af7d 100644
--- a/net/bredbandskollen/Makefile
+++ b/net/bredbandskollen/Makefile
@@ -9,7 +9,7 @@ COMMENT=	Command line tool to check internet connection speed
 
 LICENSE=	GPLv2
 
-USES=		gmake
+USES=		compiler:c++11-lang gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	dotse
@@ -26,6 +26,10 @@ OPTIONS_DEFINE=	GNUTLS
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_MAKE_ARGS=	GNUTLS=1
 
+post-patch:
+	${REINPLACE_CMD} -e 's/CXX = c++/CXX ?= c++/g' \
+		${WRKSRC}/src/framework/mk.inc
+
 do-install:
 	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/cli ${STAGEDIR}/${PREFIX}/bin/bbk_cli
 	${LN} -sf bbk_cli ${STAGEDIR}/${PREFIX}/bin/bredbandskollen
diff --git a/net/bredbandskollen/files/patch-src_framework_engine.h b/net/bredbandskollen/files/patch-src_framework_engine.h
new file mode 100644
index 000000000000..4ebf409852e8
--- /dev/null
+++ b/net/bredbandskollen/files/patch-src_framework_engine.h
@@ -0,0 +1,12 @@
+--- src/framework/engine.h.orig	2018-12-20 14:37:12 UTC
++++ src/framework/engine.h
+@@ -10,6 +10,9 @@
+ #include <map>
+ #include <vector>
+ #include <string>
++#ifdef __FreeBSD__
++#include <sys/select.h>
++#endif
+ 
+ #include "logger.h"
+ 
diff --git a/net/bredbandskollen/files/patch-src_framework_socketreceiver.h b/net/bredbandskollen/files/patch-src_framework_socketreceiver.h
new file mode 100644
index 000000000000..045902ec3909
--- /dev/null
+++ b/net/bredbandskollen/files/patch-src_framework_socketreceiver.h
@@ -0,0 +1,13 @@
+--- src/framework/socketreceiver.h.orig	2018-12-20 14:40:17 UTC
++++ src/framework/socketreceiver.h
+@@ -5,6 +5,10 @@
+ 
+ #include <sys/socket.h>
+ #include "serversocket.h"
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
++
+ class SocketConnection;
+ 
+ class SocketReceiver : public ServerSocket {
diff --git a/net/bredbandskollen/pkg-descr b/net/bredbandskollen/pkg-descr
index 980576d15a07..0d38426e0ba7 100644
--- a/net/bredbandskollen/pkg-descr
+++ b/net/bredbandskollen/pkg-descr
@@ -4,5 +4,5 @@ In Sweden.
 
 This is a command line tool that can be used instead of the web application.
 
-WWW: https://https://github.com/dotse/bbk
+WWW: https://github.com/dotse/bbk
      http://bredbandskollen.se