diff --git a/AUTHORS b/AUTHORS
index 91e08d7..5682450 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,6 +5,7 @@ Alvaro Lopes <alvieboy@alvie.com>
 
 Rene Harder <rehar@saweb.de>
 
+  components/antenna.lib
   modules/mini-usb.fpd
 
 Werner Almesberger <werner@openmoko.org>
diff --git a/atrf.sch b/atrf.sch
index d98e0e0..b4f9181 100644
--- a/atrf.sch
+++ b/atrf.sch
@@ -1,11 +1,14 @@
-EESchema Schematic File Version 2  date Mon Aug  9 21:25:35 2010
+EESchema Schematic File Version 2  date Thu Aug 12 10:58:51 2010
 LIBS:power
 LIBS:device
 LIBS:conn
 LIBS:at86rf230
 LIBS:c8051f326
 LIBS:mini_usb_b
-EELAYER 43  0
+LIBS:xtal-4
+LIBS:antenna
+LIBS:wpan-atrf-cache
+EELAYER 24  0
 EELAYER END
 $Descr A4 11700 8267
 Sheet 2 3
@@ -19,6 +22,24 @@ Comment3 ""
 Comment4 ""
 $EndDescr
 $Comp
+L ANTENNA ANT?
+U 1 1 4C63FE17
+P 8200 1550
+F 0 "ANT?" H 8200 1800 60  0000 C CNN
+F 1 "ANTENNA" H 8200 1300 60  0000 C CNN
+	1    8200 1550
+	1    0    0    -1  
+$EndComp
+$Comp
+L XTAL-4 X?
+U 1 1 4C63FA9F
+P 4750 2400
+F 0 "X?" H 4750 2750 60  0000 C CNN
+F 1 "XTAL-4" H 4750 2650 60  0000 C CNN
+	1    4750 2400
+	1    0    0    -1  
+$EndComp
+$Comp
 L AT86RF230 U?
 U 1 1 4C609C4B
 P 7300 3950
diff --git a/components/INFO b/components/INFO
index ac70dad..8fd77e9 100644
--- a/components/INFO
+++ b/components/INFO
@@ -19,3 +19,6 @@ S: at86rf230
 # the rest is ground)
 S: xtal-4
 N: nx3225sa
+
+# Generic antenna with ground on pin 1, feed on pin 2
+S: antenna
diff --git a/components/antenna.lib b/components/antenna.lib
new file mode 100644
index 0000000..7889b0c
--- /dev/null
+++ b/components/antenna.lib
@@ -0,0 +1,21 @@
+EESchema-LIBRARY Version 2.3  Date: So 07 Jun 2009 10:26:34 CDT
+#
+# ANTENNA
+#
+DEF ANTENNA ANT 0 40 Y Y 1 F N
+F0 "ANT" 0 250 60 H V C CNN
+F1 "ANTENNA" 0 -250 60 H V C CNN
+DRAW
+P 3 0 1 5  -20 -90  20 -90  20 -90 N
+P 5 0 1 5  -50 -60  50 -60  50 -60  50 -60  50 -60 N
+P 3 0 1 0  -50 90  -50 90  -50 90 N
+S -100 150 100 -150 0 1 0 N
+P 6 0 1 5  50 90  0 40  0 90  0 40  -50 90  -50 90 N
+P 4 0 1 5  0 -60  0 40  50 90  50 90 N
+P 4 0 1 5  -35 -75  35 -75  35 -75  35 -75 N
+X ~ 1 300 -50 200 L 50 50 1 1 P
+X ~ 2 300 50 200 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library
diff --git a/modules/meander.fpd b/modules/meander.fpd
index d926eb3..e8143a1 100644
--- a/modules/meander.fpd
+++ b/modules/meander.fpd
@@ -16,7 +16,7 @@ frame antenna {
 	__2: vec .(D5, 0mm)
 	__3: vec .(W2, 0mm)
 	__4: vec @(-W1/2, D4/2)
-	pad "GND" __0 .
+	pad "1" __0 .
 	pad "X" . __1
 	__5: vec .(-D1, 0mm)
 	__6: vec __1(-W1, 0mm)
@@ -29,7 +29,7 @@ frame antenna {
 	pad "X" __6 .
 	__10: vec __3(0mm, -L6)
 	__11: vec .(-W2, D4)
-	pad "FEED" . __10
+	pad "2" . __10
 	pad "X" . __3
 	__12: vec __7(0mm, -L4)
 	__13: vec .(W2, 0mm)
diff --git a/wpan-atrf.pro b/wpan-atrf.pro
index 3edcabf..c60212d 100644
--- a/wpan-atrf.pro
+++ b/wpan-atrf.pro
@@ -42,3 +42,5 @@ LibName3=conn
 LibName4=components/at86rf230
 LibName5=components/c8051f326
 LibName6=components/mini_usb_b
+LibName7=components/xtal-4
+LibName8=components/antenna