diff --git a/Utils/membind.hh b/Utils/membind.hh
index c2baf8601d2ab02570d972d2e9414cec592ee0bd..0f03365256bb0c59ef0921e8af3edb5ab79a5942 100644
--- a/Utils/membind.hh
+++ b/Utils/membind.hh
@@ -57,6 +57,15 @@
 
 ///////////////////////////////hh.p////////////////////////////////////////
 
+#define SENF_FNP(ret, fn, args) \
+    static_cast<ret (*) args>(& fn)
+
+#define SENF_MEMFNP(ret, cls, fn, args) \
+    static_cast<ret (cls::*) args>(& cls :: fn)
+
+#define SENF_MEMBINDFNP(ret, cls, fn, args) \
+    senf::membind(SENF_MEMFNP(ret, cls, fn, args), this)
+
 namespace senf {
 
 #define scOBTYPE T *
diff --git a/senf.dict b/senf.dict
index bb7d7e572f025b341e5d690269ac903adff3f284..205927186dddf3315fb924101ec741fb5e3ba82a 100644
--- a/senf.dict
+++ b/senf.dict
@@ -47,6 +47,8 @@ BaseParser
 berlios
 BerliOS
 bitfield
+bitrate
+bitrates
 bool
 boostfn
 broadcastEnabled
@@ -102,6 +104,7 @@ CXXFLAGS
 daemonization
 DatagramSection
 DataPacket
+datarate
 dd
 de
 DEBUGINFO
@@ -136,6 +139,7 @@ EmulatedTransmitter
 EmulatedWLANInterface
 enableChecksum
 endcode
+enddot
 endhtmlonly
 endif
 endl
@@ -194,6 +198,8 @@ fixvariant
 flurgle
 fno
 fokus
+fontname
+fontsize
 foo
 fooCallback
 FooException
@@ -218,6 +224,10 @@ GREPackeType
 GREParser
 hangup
 HangupException
+HardwareInterface
+HardwareWLANInterface
+headport
+Helvetica
 hh
 hideinitializer
 Hmm
@@ -256,6 +266,8 @@ inputSocket
 Institut
 int
 InterfaceAPI
+interfaceapi
+InterfaceDecorator
 IntervalTimer
 IntField
 InvalidPacketChainException
@@ -309,12 +321,16 @@ MACAddress
 MACAddressParser
 mainpage
 manualparse
+maxTxPowerIndex
+Mbit
 mcAddMembership
 mcAddr
 mcDropMembership
 mcLoop
 mem
 memberfn
+Mhz
+min
 mixin
 mkdir
 mld
@@ -346,6 +362,7 @@ MyWLANInterface
 namespace
 nbar
 nc
+nChannels
 netcat
 NetEmu
 NETwork
@@ -363,6 +380,7 @@ noinit
 noop
 noroute
 nothrow
+nParameters
 nrOfRecords
 nrOfSources
 nUsing
@@ -408,6 +426,7 @@ PacketTypeBase
 PacketTypeMixin
 PacketTypeNotRegistered
 param
+parameterIndex
 ParseArray
 parsecollection
 ParseCommandInfo
@@ -436,9 +455,11 @@ PassiveQueue
 PassiveSink
 PassiveSocketWriter
 PassiveSource
+pencolor
 png
 POPD
 POSIX
+powerIndexValue
 ppi
 pre
 prev
@@ -452,6 +473,8 @@ py
 QueryPacket
 QueueingDiscipline
 queueSize
+rankdir
+ranksep
 RateFilter
 rateFilter
 ratefilter
@@ -461,6 +484,7 @@ RawINetProtocol
 RawV
 rdynamic
 ReadInfo
+ReceiverDecorator
 refcount
 regex
 registerEvent
@@ -473,8 +497,10 @@ repos
 rerference
 rfc
 RFCs
+RL
 RO
 RP
+RSSI
 SafePacketParser
 SatCom
 Satelitenkommunikation
@@ -539,6 +565,7 @@ SimpleVectorSizer
 SiteScope
 SizeParser
 skipline
+SNR
 SocketAddress
 SocketHandle
 SocketProtocol
@@ -590,6 +617,7 @@ todo
 tokenizes
 TokensRange
 tr
+TransmitterDecorator
 TruncatedPacketException
 tt
 ttl
@@ -606,6 +634,7 @@ udpWriter
 UInt
 UIntField
 UIntFieldParser
+un
 Unhandled
 unicast
 uniquified
@@ -638,6 +667,7 @@ WirelessInterface
 WirelessReceiver
 WirelessTransmitter
 WLAN
+WLANController
 Wno
 Woverloaded
 WrapException