diff --git a/srcpkgs/libpcap/template b/srcpkgs/libpcap/template
index 233c15f245..7134f6ac86 100644
--- a/srcpkgs/libpcap/template
+++ b/srcpkgs/libpcap/template
@@ -1,48 +1,29 @@
 # Template file for 'libpcap'
 pkgname=libpcap
-version=1.6.1
+version=1.6.2
 revision=1
 build_style=gnu-configure
-configure_args="--enable-ipv6 --with-libnl --with-pcap=linux"
+configure_args="--enable-ipv6 --with-libnl --with-pcap=linux
+ $(vopt_enable bluetooth) $(vopt_enable dbus) $(vopt_enable usb canusb)"
 hostmakedepends="pkg-config flex libnl3-devel"
-makedepends="libnl3-devel"
+makedepends="libnl3-devel
+ $(vopt_if bluetooth libbluetooth-devel)
+ $(vopt_if dbus dbus-devel)
+ $(vopt_if usb libusb-devel)"
 short_desc="System-independent interface for user-level packet capture"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.tcpdump.org/"
 license="BSD"
 distfiles="http://www.tcpdump.org/release/$pkgname-$version.tar.gz"
-checksum=116cbb3ac9e96d5dd7b39638a2f894a67fa3dcf06d794e6dae2b9a942ad13476
+checksum=5db3e2998f1eeba2c76da55da5d474248fe19c44f49e15cac8a796a2c7e19690
+
+build_options="bluetooth dbus usb"
+build_options_default="usb"
 
 post_install() {
 	vlicense LICENSE
 }
 
-# Package build options
-build_options="bluetooth dbus usb"
-build_options_default="usb"
-
-
-if [ "$build_option_bluetooth" ]; then
-	configure_args+=" --enable-bluetooth"
-	makedepends+=" libbluetooth-devel"
-else
-	configure_args+=" --disable-bluetooth"
-fi
-
-if [ "$build_option_dbus" ]; then
-	configure_args+=" --enable-dbus"
-	makedepends+=" dbus-devel"
-else
-	configure_args+=" --disable-dbus"
-fi
-
-if [ "$build_option_usb" ]; then
-	configure_args+=" --enable-canusb"
-	makedepends+=" libusb-devel"
-else
-	configure_args+=" --disable-canusb"
-fi
-
 libpcap-devel_package() {
 	depends="libnl3-devel libpcap>=${version}_${revision}"
 	short_desc+=" - development files"