diff --git a/AUTHORS b/AUTHORS
index b76be25..c3857b9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -80,6 +80,7 @@ Werner Almesberger <werner@almesberger.net>
   components/lpc1100-qfn33.lib
   components/tps6216x.lib
   components/lis3dh.lib
+  components/memcard-shield4.lib (based on MEMCARD8 from con.lib, by Adam Wang)
   modules/pads.fpd
   modules/stdpass.fpd
   modules/8_10-card.fpd
diff --git a/components/HIERARCHY b/components/HIERARCHY
index 67d5fac..9af2b61 100644
--- a/components/HIERARCHY
+++ b/components/HIERARCHY
@@ -121,6 +121,8 @@ Connector
 	Card
 		8:10-card
 		MEMCARD8
+		MEMCARD8-SHIELD4
+		MEMCARD8-SHIELD4-SW
 	Circular
 		DIN_5_2S
 		XLR-3-F-R
diff --git a/components/components.pro b/components/components.pro
index 1b8b05a..730d1e0 100644
--- a/components/components.pro
+++ b/components/components.pro
@@ -146,3 +146,4 @@ LibName74=./xc6slx9-csg324
 LibName75=./lpc1100-qfn33
 LibName76=./tps6216x
 LibName77=./lis3dh
+LibName78=./memcard8
diff --git a/components/memcard8.lib b/components/memcard8.lib
new file mode 100644
index 0000000..e36dc29
--- /dev/null
+++ b/components/memcard8.lib
@@ -0,0 +1,70 @@
+EESchema-LIBRARY Version 2.3  Date: Sat Dec 22 19:58:28 2012
+#encoding utf-8
+#
+# MEMCARD8-SHIELD4
+#
+DEF MEMCARD8-SHIELD4 CON 0 40 Y N 1 F N
+F0 "CON" -100 500 60 H V L CNN
+F1 "MEMCARD8-SHIELD4" 150 -450 60 H V C CNN
+DRAW
+T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
+T 0 10 0 60 0 0 0 CLK  Normal 0 C C
+T 0 15 200 60 0 0 0 CMD  Normal 0 C C
+T 0 30 -200 60 0 0 0 DAT0  Normal 0 C C
+T 0 30 -300 60 0 0 0 DAT1  Normal 0 C C
+T 0 25 400 60 0 0 0 DAT2  Normal 0 C C
+T 900 350 -150 60 0 0 0 SHIELD  Normal 0 C C
+T 0 10 100 60 0 0 0 VDD  Normal 0 C C
+T 0 10 -100 60 0 0 0 VSS  Normal 0 C C
+S -100 450 400 -350 0 0 0 N
+X 1 1 -350 400 250 R 50 50 1 1 P
+X 2 2 -350 300 250 R 50 50 1 1 P
+X 3 3 -350 200 250 R 50 50 1 1 P
+X 4 4 -350 100 250 R 50 50 1 1 P
+X 5 5 -350 0 250 R 50 50 1 1 P
+X 6 6 -350 -100 250 R 50 50 1 1 P
+X 7 7 -350 -200 250 R 50 50 1 1 P
+X 8 8 -350 -300 250 R 50 50 1 1 P
+X SHIELD S1 700 0 300 L 50 50 1 1 W
+X SHIELD S2 700 -100 300 L 50 50 1 1 W
+X SHIELD S3 700 -200 300 L 50 50 1 1 W
+X SHIELD S4 700 -300 300 L 50 50 1 1 W
+ENDDRAW
+ENDDEF
+#
+# MEMCARD8-SHIELD4-SW
+#
+DEF MEMCARD8-SHIELD4-SW CON 0 40 Y N 1 F N
+F0 "CON" -100 500 60 H V L CNN
+F1 "MEMCARD8-SHIELD4-SW" 250 -450 60 H V C CNN
+DRAW
+T 900 450 250 60 0 0 0 CARD  Normal 0 C C
+T 0 115 300 60 0 0 0 CD/DAT3  Normal 0 C C
+T 0 10 0 60 0 0 0 CLK  Normal 0 C C
+T 0 15 200 60 0 0 0 CMD  Normal 0 C C
+T 0 30 -200 60 0 0 0 DAT0  Normal 0 C C
+T 0 30 -300 60 0 0 0 DAT1  Normal 0 C C
+T 0 25 400 60 0 0 0 DAT2  Normal 0 C C
+T 900 550 250 60 0 0 0 DETECT  Normal 0 C C
+T 900 550 -150 60 0 0 0 SHIELD  Normal 0 C C
+T 0 10 100 60 0 0 0 VDD  Normal 0 C C
+T 0 10 -100 60 0 0 0 VSS  Normal 0 C C
+S -100 450 600 -350 0 1 0 N
+X 1 1 -350 400 250 R 50 50 1 1 P
+X 2 2 -350 300 250 R 50 50 1 1 P
+X 3 3 -350 200 250 R 50 50 1 1 P
+X 4 4 -350 100 250 R 50 50 1 1 P
+X 5 5 -350 0 250 R 50 50 1 1 P
+X 6 6 -350 -100 250 R 50 50 1 1 P
+X 7 7 -350 -200 250 R 50 50 1 1 P
+X 8 8 -350 -300 250 R 50 50 1 1 P
+X SHIELD S1 900 0 300 L 50 50 1 1 W
+X SHIELD S2 900 -100 300 L 50 50 1 1 W
+X SHIELD S3 900 -200 300 L 50 50 1 1 W
+X SHIELD S4 900 -300 300 L 50 50 1 1 W
+X SW1 SW1 900 400 300 L 50 50 1 1 P
+X SW2 SW2 900 300 300 L 50 50 1 1 P
+ENDDRAW
+ENDDEF
+#
+#End Library