diff --git a/components/EXPAND b/components/EXPAND
index 7a82361..c0af76c 100644
--- a/components/EXPAND
+++ b/components/EXPAND
@@ -26,9 +26,12 @@ Codec
 Connector
 	Generic
 		TESTPOINT
+		conn_2
+		conn_3
 		conn_4
 		conn_5x2
 		conn_7x2
+		conn_10x2
 	Card
 		8:10-card
 		MEMCARD8
diff --git a/components/Makefile b/components/Makefile
index 440f13a..3377813 100644
--- a/components/Makefile
+++ b/components/Makefile
@@ -4,7 +4,7 @@
 # Note that we don't have the concept of a "library of everything" so far.
 #
 
-.PHONY:		all sch catalog view missing clean spotless
+.PHONY:		all sch catalog view upload missing clean spotless
 
 all:		sch
 
@@ -17,13 +17,16 @@ sch:
 DESCR-dcm:	*.dcm
 		../scripts/dcm2desc -L . >$@ || { rm -f $@; exit 1; }
 
-catalog:	DESCR-dcm
+catalog catalog.pdf: EXPAND DESCR-dcm *.lib
 		genex -p -L . EXPAND DESCR-dcm >catalog.pdf || \
 		  { rm -f catalog.pdf; exit 1; }
 
-view:
+view:		catalog.pdf
 		$${DSV_PDFVIEWER:-xpdf} catalog.pdf
 
+upload:		catalog.pdf
+		qippl catalog.pdf tmp/kicad-libs-components.pdf
+
 missing:
 		../scripts/missing-in-tree -L . EXPAND