diff --git a/demos/pic_programmer/pic_programmer.sch b/demos/pic_programmer/pic_programmer.sch
index 4d3dc46e5e..821a11e2b3 100644
--- a/demos/pic_programmer/pic_programmer.sch
+++ b/demos/pic_programmer/pic_programmer.sch
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 1
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,.\pic_programmer.cache
+EESchema Schematic File Version 2
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,./pic_programmer.cache
 EELAYER 23  0
 EELAYER END
 $Descr A4 11700 8267
-Sheet 1 2
+Sheet 1 1
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
 Date "16 may 2007"
 Rev "2"
@@ -274,110 +274,110 @@ Wire Wire Line
 Wire Wire Line
 	5700 1250 6100 1250
 $Comp
-L C C9
+L C C
 U 1 1 464AD280
 P 5700 1000
-F 0 "C9" H 5750 1100 50  0000 L C
+F 0 "C" H 5750 1100 50  0000 L C
 F 1 "22OnF" H 5750 900 50  0000 L C
 	1    5700 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR01
+L VCC #PWR
 U 1 1 4639BB04
 P 8650 2550
-F 0 "#PWR01" H 8650 2650 30  0001 C C
+F 0 "#PWR" H 8650 2650 30  0001 C C
 F 1 "VCC" H 8650 2650 30  0000 C C
 	1    8650 2550
 	1    0    0    -1  
 $EndComp
 $Comp
-L JUMPER JP1
+L JUMPER JP
 U 1 1 4639BAF8
 P 8650 2850
-F 0 "JP1" H 8650 3000 60  0000 C C
+F 0 "JP" H 8650 3000 60  0000 C C
 F 1 "JUMPER" H 8650 2770 40  0000 C C
 	1    8650 2850
 	0    1    1    0   
 $EndComp
 $Comp
-L DIODESCH D11
+L DIODESCH D
 U 1 1 4639BA28
 P 7150 2900
-F 0 "D11" H 7150 3000 40  0000 C C
+F 0 "D" H 7150 3000 40  0000 C C
 F 1 "BAT43" H 7150 2800 40  0000 C C
 	1    7150 2900
 	-1   0    0    1   
 $EndComp
 $Comp
-L VCC #PWR02
+L VCC #PWR
 U 1 1 4639BA17
 P 8300 2700
-F 0 "#PWR02" H 8300 2800 30  0001 C C
+F 0 "#PWR" H 8300 2800 30  0001 C C
 F 1 "VCC" H 8300 2800 30  0000 C C
 	1    8300 2700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR03
+L GND #PWR
 U 1 1 4639B9EB
 P 7650 3700
-F 0 "#PWR03" H 7650 3700 30  0001 C C
+F 0 "#PWR" H 7650 3700 30  0001 C C
 F 1 "GND" H 7650 3630 30  0001 C C
 	1    7650 3700
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D12
+L LED D
 U 1 1 4639B9EA
 P 7650 3500
-F 0 "D12" H 7650 3600 50  0000 C C
+F 0 "D" H 7650 3600 50  0000 C C
 F 1 "YELLOW-LED" H 7650 3400 50  0000 C C
 F 4 "YELLOW-LED" H 7700 3650 40  0000 C C
 	1    7650 3500
 	0    1    1    0   
 $EndComp
 $Comp
-L R R21
+L R R
 U 1 1 4639B9E9
 P 7900 3200
-F 0 "R21" V 7980 3200 50  0000 C C
+F 0 "R" V 7980 3200 50  0000 C C
 F 1 "470" V 7900 3200 50  0000 C C
 	1    7900 3200
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R20
+L R R
 U 1 1 4639B9B3
 P 7650 2650
-F 0 "R20" V 7730 2650 50  0000 C C
+F 0 "R" V 7730 2650 50  0000 C C
 F 1 "2.2K" V 7650 2650 50  0000 C C
 	1    7650 2650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R19
+L R R
 U 1 1 4639B9B0
 P 7650 2900
-F 0 "R19" V 7730 2900 50  0000 C C
+F 0 "R" V 7730 2900 50  0000 C C
 F 1 "2.2K" V 7650 2900 50  0000 C C
 	1    7650 2900
 	0    -1   -1   0   
 $EndComp
 $Comp
-L PNP Q3
+L PNP Q
 U 1 1 4639B996
 P 8200 2900
-F 0 "Q3" H 8350 2900 60  0000 C C
+F 0 "Q" H 8350 2900 60  0000 C C
 F 1 "BC307" H 8104 3050 60  0000 C C
 	1    8200 2900
 	1    0    0    1   
 $EndComp
 $Comp
-L VCC #PWR04
+L VCC #PWR
 U 1 1 4638AB33
 P 7400 2650
-F 0 "#PWR04" H 7400 2750 30  0001 C C
+F 0 "#PWR" H 7400 2750 30  0001 C C
 F 1 "VCC" H 7400 2750 30  0000 C C
 	1    7400 2650
 	1    0    0    -1  
@@ -385,37 +385,37 @@ $EndComp
 Text Notes 9700 6750 0    50   ~
 ADJUST for VPP = 13V
 $Comp
-L POT RV1
+L POT RV
 U 1 1 443D0101
 P 9500 6750
-F 0 "RV1" H 9500 6650 50  0000 C C
+F 0 "RV" H 9500 6650 50  0000 C C
 F 1 "1K" H 9500 6750 50  0000 C C
 	1    9500 6750
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R18
+L R R
 U 1 1 44369638
 P 7350 1600
-F 0 "R18" V 7430 1600 50  0000 C C
+F 0 "R" V 7430 1600 50  0000 C C
 F 1 "220" V 7350 1600 50  0000 C C
 	1    7350 1600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR05
+L GND #PWR
 U 1 1 442AABC2
 P 6550 2650
-F 0 "#PWR05" H 6550 2650 30  0001 C C
+F 0 "#PWR" H 6550 2650 30  0001 C C
 F 1 "GND" H 6550 2580 30  0001 C C
 	1    6550 2650
 	1    0    0    -1  
 $EndComp
 $Comp
-L PWR_FLAG #FLG06
+L PWR_FLAG #FLG
 U 1 1 442A8330
 P 1600 6900
-F 0 "#FLG06" H 1600 7170 30  0001 C C
+F 0 "#FLG" H 1600 7170 30  0001 C C
 F 1 "PWR_FLAG" H 1600 7130 30  0000 C C
 	1    1600 6900
 	-1   0    0    1   
@@ -428,6 +428,7 @@ Text Label 8400 3500 0    60   ~
 VPP/MCLR
 $Sheet
 S 9200 2850 1600 1750
+U 47B213F3
 F0 "pic_sockets.sch" 60
 F1 "pic_sockets.sch" 60
 F2 "VPP-MCLR" I L 9200 3500 60 
@@ -447,37 +448,37 @@ Text Notes 850  6500 0    60   ~
 8 to 15V
 NoConn ~ 6650 6000
 $Comp
-L DIODESCH D10
+L DIODESCH D
 U 1 1 442A6026
 P 9300 6250
-F 0 "D10" H 9300 6350 40  0000 C C
+F 0 "D" H 9300 6350 40  0000 C C
 F 1 "SCHOTTKY" H 9300 6150 40  0000 C C
 	1    9300 6250
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R10
+L R R
 U 1 1 442A5F83
 P 8250 6950
-F 0 "R10" V 8330 6950 50  0000 C C
+F 0 "R" V 8330 6950 50  0000 C C
 F 1 "5,1K" V 8250 6950 50  0000 C C
 	1    8250 6950
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C4
+L C C
 U 1 1 442A5F61
 P 8750 7150
-F 0 "C4" H 8800 7250 50  0000 L C
+F 0 "C" H 8800 7250 50  0000 L C
 F 1 "0" V 8800 7050 50  0000 L C
 	1    8750 7150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L LT1373 U4
+L LT1373 U
 U 1 1 442A5E20
 P 7650 6250
-F 0 "U4" H 8250 6750 60  0000 C C
+F 0 "U" H 8250 6750 60  0000 C C
 F 1 "LT1373" H 7150 6750 60  0000 C C
 	1    7650 6250
 	1    0    0    -1  
@@ -485,119 +486,119 @@ $EndComp
 Text Notes 6150 5450 0    60   ~
 VPP (13V) power
 $Comp
-L GND #PWR07
+L GND #PWR
 U 1 1 442A58DF
 P 10150 7050
-F 0 "#PWR07" H 10150 7050 30  0001 C C
+F 0 "#PWR" H 10150 7050 30  0001 C C
 F 1 "GND" H 10150 6980 30  0001 C C
 	1    10150 7050
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R16
+L R R
 U 1 1 442A58DC
 P 9900 6500
-F 0 "R16" V 9980 6500 50  0000 C C
+F 0 "R" V 9980 6500 50  0000 C C
 F 1 "62K" V 9900 6500 50  0000 C C
 	1    9900 6500
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R15
+L R R
 U 1 1 442A58D7
 P 9900 7000
-F 0 "R15" V 9980 7000 50  0000 C C
+F 0 "R" V 9980 7000 50  0000 C C
 F 1 "6.2K" V 9900 7000 50  0000 C C
 	1    9900 7000
 	0    -1   -1   0   
 $EndComp
 NoConn ~ 6650 6500
 $Comp
-L GND #PWR08
+L GND #PWR
 U 1 1 442A58B8
 P 9150 6850
-F 0 "#PWR08" H 9150 6850 30  0001 C C
+F 0 "#PWR" H 9150 6850 30  0001 C C
 F 1 "GND" H 9150 6780 30  0001 C C
 	1    9150 6850
 	0    -1   -1   0   
 $EndComp
 $Comp
-L C C5
+L C C
 U 1 1 442A58B1
 P 8900 6850
-F 0 "C5" H 8950 6950 50  0000 L C
+F 0 "C" H 8950 6950 50  0000 L C
 F 1 "10nF" V 9050 6700 50  0000 L C
 	1    8900 6850
 	0    -1   -1   0   
 $EndComp
 $Comp
-L PWR_FLAG #FLG09
+L PWR_FLAG #FLG
 U 1 1 442A5893
 P 9950 6200
-F 0 "#FLG09" H 9950 6470 30  0001 C C
+F 0 "#FLG" H 9950 6470 30  0001 C C
 F 1 "PWR_FLAG" H 9950 6430 30  0000 C C
 	1    9950 6200
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR010
+L VCC #PWR
 U 1 1 442A5882
 P 9300 5900
-F 0 "#PWR010" H 9300 6000 30  0001 C C
+F 0 "#PWR" H 9300 6000 30  0001 C C
 F 1 "VCC" H 9300 6000 30  0000 C C
 	1    9300 5900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR011
+L GND #PWR
 U 1 1 442A5852
 P 10700 6300
-F 0 "#PWR011" H 10700 6300 30  0001 C C
+F 0 "#PWR" H 10700 6300 30  0001 C C
 F 1 "GND" H 10700 6230 30  0001 C C
 	1    10700 6300
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C3
+L CP C
 U 1 1 442A584C
 P 10450 6250
-F 0 "C3" H 10500 6350 50  0000 L C
+F 0 "C" H 10500 6350 50  0000 L C
 F 1 "22uF/25V" H 10500 6150 50  0000 L C
 	1    10450 6250
 	0    -1   -1   0   
 $EndComp
 $Comp
-L VPP #PWR48
+L VPP #PWR
 U 1 1 442A5846
 P 10150 6200
-F 0 "#PWR48" H 10150 6400 40  0001 C C
+F 0 "#PWR" H 10150 6400 40  0001 C C
 F 1 "VPP" H 10150 6350 40  0000 C C
 	1    10150 6200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR012
+L GND #PWR
 U 1 1 442A580B
 P 7350 7000
-F 0 "#PWR012" H 7350 7000 30  0001 C C
+F 0 "#PWR" H 7350 7000 30  0001 C C
 F 1 "GND" H 7350 6930 30  0001 C C
 	1    7350 7000
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR013
+L VCC #PWR
 U 1 1 442A57CB
 P 7650 5500
-F 0 "#PWR013" H 7650 5600 30  0001 C C
+F 0 "#PWR" H 7650 5600 30  0001 C C
 F 1 "VCC" H 7650 5600 30  0000 C C
 	1    7650 5500
 	1    0    0    -1  
 $EndComp
 $Comp
-L INDUCTOR L1
+L INDUCTOR L
 U 1 1 442A57BE
 P 9000 6000
-F 0 "L1" V 8950 6000 40  0000 C C
+F 0 "L" V 8950 6000 40  0000 C C
 F 1 "22uH" V 9100 6000 40  0000 C C
 	1    9000 6000
 	0    -1   -1   0   
@@ -607,137 +608,137 @@ NoConn ~ 1700 3400
 NoConn ~ 1700 3300
 NoConn ~ 1700 3200
 $Comp
-L GND #PWR014
+L GND #PWR
 U 1 1 442A50C2
 P 7050 2350
-F 0 "#PWR014" H 7050 2350 30  0001 C C
+F 0 "#PWR" H 7050 2350 30  0001 C C
 F 1 "GND" H 7050 2280 30  0001 C C
 	1    7050 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R17
+L R R
 U 1 1 442A50BF
 P 7050 2100
-F 0 "R17" V 7130 2100 50  0000 C C
+F 0 "R" V 7130 2100 50  0000 C C
 F 1 "22K" V 7050 2100 50  0000 C C
 	1    7050 2100
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR015
+L VCC #PWR
 U 1 1 442A50B3
 P 3400 6600
-F 0 "#PWR015" H 3400 6700 30  0001 C C
+F 0 "#PWR" H 3400 6700 30  0001 C C
 F 1 "VCC" H 3400 6700 30  0000 C C
 	1    3400 6600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR016
+L GND #PWR
 U 1 1 442A5095
 P 4150 7150
-F 0 "#PWR016" H 4150 7150 30  0001 C C
+F 0 "#PWR" H 4150 7150 30  0001 C C
 F 1 "GND" H 4150 7080 30  0001 C C
 	1    4150 7150
 	1    0    0    -1  
 $EndComp
 $Comp
-L LED D9
+L LED D
 U 1 1 442A5084
 P 4150 6950
-F 0 "D9" H 4150 7050 50  0000 C C
+F 0 "D" H 4150 7050 50  0000 C C
 F 1 "GREEN-LED" H 4150 6850 50  0000 C C
 F 4 "GREEN LED" H 4200 7100 40  0000 C C
 	1    4150 6950
 	0    1    1    0   
 $EndComp
 $Comp
-L R R14
+L R R
 U 1 1 442A5083
 P 3850 6650
-F 0 "R14" V 3930 6650 50  0000 C C
+F 0 "R" V 3930 6650 50  0000 C C
 F 1 "470" V 3850 6650 50  0000 C C
 	1    3850 6650
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR017
+L GND #PWR
 U 1 1 442A5057
 P 3200 7100
-F 0 "#PWR017" H 3200 7100 30  0001 C C
+F 0 "#PWR" H 3200 7100 30  0001 C C
 F 1 "GND" H 3200 7030 30  0001 C C
 	1    3200 7100
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C1
+L CP C
 U 1 1 442A5056
 P 3200 6900
-F 0 "C1" H 3250 7000 50  0000 L C
+F 0 "C" H 3250 7000 50  0000 L C
 F 1 "100uF" H 3250 6800 50  0000 L C
 	1    3200 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR018
+L GND #PWR
 U 1 1 442A5050
 P 2700 6950
-F 0 "#PWR018" H 2700 6950 30  0001 C C
+F 0 "#PWR" H 2700 6950 30  0001 C C
 F 1 "GND" H 2700 6880 30  0001 C C
 	1    2700 6950
 	1    0    0    -1  
 $EndComp
 $Comp
-L 7805 U3
+L 7805 U
 U 1 1 442A504A
 P 2700 6700
-F 0 "U3" H 2850 6504 60  0000 C C
+F 0 "U" H 2850 6504 60  0000 C C
 F 1 "7805" H 2700 6900 60  0000 C C
 	1    2700 6700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR019
+L GND #PWR
 U 1 1 442A5023
 P 1950 7100
-F 0 "#PWR019" H 1950 7100 30  0001 C C
+F 0 "#PWR" H 1950 7100 30  0001 C C
 F 1 "GND" H 1950 7030 30  0001 C C
 	1    1950 7100
 	1    0    0    -1  
 $EndComp
 $Comp
-L CP C2
+L CP C
 U 1 1 442A501D
 P 1950 6900
-F 0 "C2" H 2000 7000 50  0000 L C
+F 0 "C" H 2000 7000 50  0000 L C
 F 1 "220uF" H 2000 6800 50  0000 L C
 	1    1950 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR020
+L GND #PWR
 U 1 1 442A500F
 P 1400 6900
-F 0 "#PWR020" H 1400 6900 30  0001 C C
+F 0 "#PWR" H 1400 6900 30  0001 C C
 F 1 "GND" H 1400 6830 30  0001 C C
 	1    1400 6900
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODE D1
+L DIODE D
 U 1 1 442A500B
 P 1650 6650
-F 0 "D1" H 1650 6750 40  0000 C C
+F 0 "D" H 1650 6750 40  0000 C C
 F 1 "1N4004" H 1650 6550 40  0000 C C
 	1    1650 6650
 	1    0    0    -1  
 $EndComp
 $Comp
-L CONN_2 P1
+L CONN_2 P
 U 1 1 442A4FE7
 P 1000 6750
-F 0 "P1" V 950 6750 40  0000 C C
+F 0 "P" V 950 6750 40  0000 C C
 F 1 "CONN_2" V 1050 6750 40  0000 C C
 	1    1000 6750
 	-1   0    0    1   
@@ -745,10 +746,10 @@ $EndComp
 Text Label 7750 1600 0    60   ~
 VPP/MCLR
 $Comp
-L LED D8
+L LED D
 U 1 1 442A4F5D
 P 6550 2400
-F 0 "D8" H 6550 2500 50  0000 C C
+F 0 "D" H 6550 2500 50  0000 C C
 F 1 "RED-LED" H 6550 2300 50  0000 C C
 F 4 "Low Current Led" H 6600 2550 40  0000 C C
 F 5 "RED LED" H 6550 2250 40  0000 C C
@@ -756,64 +757,64 @@ F 5 "RED LED" H 6550 2250 40  0000 C C
 	0    1    1    0   
 $EndComp
 $Comp
-L R R9
+L R R
 U 1 1 442A4F52
 P 6550 1900
-F 0 "R9" V 6630 1900 50  0000 C C
+F 0 "R" V 6630 1900 50  0000 C C
 F 1 "2.2K" V 6550 1900 50  0000 C C
 	1    6550 1900
 	1    0    0    -1  
 $EndComp
 $Comp
-L VPP #PWR47
+L VPP #PWR
 U 1 1 442A4F48
 P 6550 1100
-F 0 "#PWR47" H 6550 1300 40  0001 C C
+F 0 "#PWR" H 6550 1300 40  0001 C C
 F 1 "VPP" H 6550 1250 40  0000 C C
 	1    6550 1100
 	1    0    0    -1  
 $EndComp
 $Comp
-L VPP #PWR46
+L VPP #PWR
 U 1 1 442A4F44
 P 6100 700
-F 0 "#PWR46" H 6100 900 40  0001 C C
+F 0 "#PWR" H 6100 900 40  0001 C C
 F 1 "VPP" H 6100 850 40  0000 C C
 	1    6100 700 
 	1    0    0    -1  
 $EndComp
 $Comp
-L PNP Q2
+L PNP Q
 U 1 1 442A4F30
 P 6450 1400
-F 0 "Q2" H 6600 1400 60  0000 C C
+F 0 "Q" H 6600 1400 60  0000 C C
 F 1 "BC307" H 6354 1550 60  0000 C C
 	1    6450 1400
 	1    0    0    1   
 $EndComp
 $Comp
-L R R7
+L R R
 U 1 1 442A4F2A
 P 6100 1000
-F 0 "R7" V 6180 1000 50  0000 C C
+F 0 "R" V 6180 1000 50  0000 C C
 F 1 "10K" V 6100 1000 50  0000 C C
 	1    6100 1000
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R11
+L R R
 U 1 1 442A4F23
 P 5750 1400
-F 0 "R11" V 5830 1400 50  0000 C C
+F 0 "R" V 5830 1400 50  0000 C C
 F 1 "22K" V 5750 1400 50  0000 C C
 	1    5750 1400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR021
+L GND #PWR
 U 1 1 442A4F1C
 P 5450 1900
-F 0 "#PWR021" H 5450 1900 30  0001 C C
+F 0 "#PWR" H 5450 1900 30  0001 C C
 F 1 "GND" H 5450 1830 30  0001 C C
 	1    5450 1900
 	1    0    0    -1  
@@ -825,10 +826,10 @@ CLOCK-RB6
 Text Label 5500 3150 0    60   ~
 DATA-RB7
 $Comp
-L NPN Q1
+L NPN Q
 U 1 1 442A4EB9
 P 5350 1700
-F 0 "Q1" H 5500 1700 50  0000 C C
+F 0 "Q" H 5500 1700 50  0000 C C
 F 1 "BC237" H 5252 1850 50  0000 C C
 	1    5350 1700
 	1    0    0    -1  
@@ -836,10 +837,10 @@ $EndComp
 Text Label 2350 5100 0    60   ~
 PC-CLOCK-OUT
 $Comp
-L GND #PWR022
+L GND #PWR
 U 1 1 442A4E06
 P 1700 4000
-F 0 "#PWR022" H 1700 4000 30  0001 C C
+F 0 "#PWR" H 1700 4000 30  0001 C C
 F 1 "GND" H 1700 3930 30  0001 C C
 	1    1700 4000
 	0    -1   -1   0   
@@ -849,298 +850,298 @@ PC-DATA-IN
 Text Label 2500 3150 0    60   ~
 PC-DATA-OUT
 $Comp
-L GND #PWR023
+L GND #PWR
 U 1 1 442A4DB3
 P 2800 2250
-F 0 "#PWR023" H 2800 2250 30  0001 C C
+F 0 "#PWR" H 2800 2250 30  0001 C C
 F 1 "GND" H 2800 2180 30  0001 C C
 	1    2800 2250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR024
+L GND #PWR
 U 1 1 442A4DAE
 P 3200 5650
-F 0 "#PWR024" H 3200 5650 30  0001 C C
+F 0 "#PWR" H 3200 5650 30  0001 C C
 F 1 "GND" H 3200 5580 30  0001 C C
 	1    3200 5650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR025
+L GND #PWR
 U 1 1 442A4DAB
 P 3200 3700
-F 0 "#PWR025" H 3200 3700 30  0001 C C
+F 0 "#PWR" H 3200 3700 30  0001 C C
 F 1 "GND" H 3200 3630 30  0001 C C
 	1    3200 3700
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R8
+L R R
 U 1 1 442A4D92
 P 4700 1700
-F 0 "R8" V 4780 1700 50  0000 C C
+F 0 "R" V 4780 1700 50  0000 C C
 F 1 "1K" V 4700 1700 50  0000 C C
 	1    4700 1700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R13
+L R R
 U 1 1 442A4D8D
 P 5100 5100
-F 0 "R13" V 5180 5100 50  0000 C C
+F 0 "R" V 5180 5100 50  0000 C C
 F 1 "470" V 5100 5100 50  0000 C C
 	1    5100 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R12
+L R R
 U 1 1 442A4D85
 P 5100 3150
-F 0 "R12" V 5180 3150 50  0000 C C
+F 0 "R" V 5180 3150 50  0000 C C
 F 1 "470" V 5100 3150 50  0000 C C
 	1    5100 3150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR026
+L GND #PWR
 U 1 1 442A4D75
 P 4350 4500
-F 0 "#PWR026" H 4350 4500 30  0001 C C
+F 0 "#PWR" H 4350 4500 30  0001 C C
 F 1 "GND" H 4350 4430 30  0001 C C
 	1    4350 4500
 	1    0    0    -1  
 $EndComp
 $Comp
-L 74LS125 U2
+L 74LS125 U
 U 4 1 442A4D6B
 P 4350 4200
-F 0 "U2" H 4350 4300 50  0000 L B
+F 0 "U" H 4350 4300 50  0000 L B
 F 1 "74HC125" H 4400 4050 40  0000 L T
 	4    4350 4200
 	-1   0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR027
+L VCC #PWR
 U 1 1 442A4D68
 P 3850 4650
-F 0 "#PWR027" H 3850 4750 30  0001 C C
+F 0 "#PWR" H 3850 4750 30  0001 C C
 F 1 "VCC" H 3850 4750 30  0000 C C
 	1    3850 4650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR028
+L GND #PWR
 U 1 1 442A4D67
 P 3850 5600
-F 0 "#PWR028" H 3850 5600 30  0001 C C
+F 0 "#PWR" H 3850 5600 30  0001 C C
 F 1 "GND" H 3850 5530 30  0001 C C
 	1    3850 5600
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR029
+L GND #PWR
 U 1 1 442A4D66
 P 4350 5400
-F 0 "#PWR029" H 4350 5400 30  0001 C C
+F 0 "#PWR" H 4350 5400 30  0001 C C
 F 1 "GND" H 4350 5330 30  0001 C C
 	1    4350 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODESCH D7
+L DIODESCH D
 U 1 1 442A4D65
 P 3850 5400
-F 0 "D7" H 3850 5500 40  0000 C C
+F 0 "D" H 3850 5500 40  0000 C C
 F 1 "BAT43" H 3850 5300 40  0000 C C
 	1    3850 5400
 	0    -1   -1   0   
 $EndComp
 $Comp
-L DIODESCH D6
+L DIODESCH D
 U 1 1 442A4D64
 P 3850 4850
-F 0 "D6" H 3850 4950 40  0000 C C
+F 0 "D" H 3850 4950 40  0000 C C
 F 1 "BAT43" H 3850 4750 40  0000 C C
 	1    3850 4850
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R6
+L R R
 U 1 1 442A4D63
 P 3200 5400
-F 0 "R6" V 3280 5400 50  0000 C C
+F 0 "R" V 3280 5400 50  0000 C C
 F 1 "10K" V 3200 5400 50  0000 C C
 	1    3200 5400
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R5
+L R R
 U 1 1 442A4D62
 P 3500 5100
-F 0 "R5" V 3580 5100 50  0000 C C
+F 0 "R" V 3580 5100 50  0000 C C
 F 1 "10K" V 3500 5100 50  0000 C C
 	1    3500 5100
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 74LS125 U2
+L 74LS125 U
 U 3 1 442A4D61
 P 4350 5100
-F 0 "U2" H 4350 5200 50  0000 L B
+F 0 "U" H 4350 5200 50  0000 L B
 F 1 "74HC125" H 4400 4950 40  0000 L T
 	3    4350 5100
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR030
+L VCC #PWR
 U 1 1 442A4D60
 P 3850 2700
-F 0 "#PWR030" H 3850 2800 30  0001 C C
+F 0 "#PWR" H 3850 2800 30  0001 C C
 F 1 "VCC" H 3850 2800 30  0000 C C
 	1    3850 2700
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR031
+L GND #PWR
 U 1 1 442A4D5F
 P 3850 3650
-F 0 "#PWR031" H 3850 3650 30  0001 C C
+F 0 "#PWR" H 3850 3650 30  0001 C C
 F 1 "GND" H 3850 3580 30  0001 C C
 	1    3850 3650
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR032
+L GND #PWR
 U 1 1 442A4D5E
 P 4350 3450
-F 0 "#PWR032" H 4350 3450 30  0001 C C
+F 0 "#PWR" H 4350 3450 30  0001 C C
 F 1 "GND" H 4350 3380 30  0001 C C
 	1    4350 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODESCH D5
+L DIODESCH D
 U 1 1 442A4D5D
 P 3850 3450
-F 0 "D5" H 3850 3550 40  0000 C C
+F 0 "D" H 3850 3550 40  0000 C C
 F 1 "BAT43" H 3850 3350 40  0000 C C
 	1    3850 3450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L DIODESCH D4
+L DIODESCH D
 U 1 1 442A4D5C
 P 3850 2900
-F 0 "D4" H 3850 3000 40  0000 C C
+F 0 "D" H 3850 3000 40  0000 C C
 F 1 "BAT43" H 3850 2800 40  0000 C C
 	1    3850 2900
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R4
+L R R
 U 1 1 442A4D5B
 P 3200 3450
-F 0 "R4" V 3280 3450 50  0000 C C
+F 0 "R" V 3280 3450 50  0000 C C
 F 1 "10K" V 3200 3450 50  0000 C C
 	1    3200 3450
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R3
+L R R
 U 1 1 442A4D5A
 P 3500 3150
-F 0 "R3" V 3580 3150 50  0000 C C
+F 0 "R" V 3580 3150 50  0000 C C
 F 1 "10K" V 3500 3150 50  0000 C C
 	1    3500 3150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 74LS125 U2
+L 74LS125 U
 U 2 1 442A4D59
 P 4350 3150
-F 0 "U2" H 4350 3250 50  0000 L B
+F 0 "U" H 4350 3250 50  0000 L B
 F 1 "74HC125" H 4400 3000 40  0000 L T
 	2    4350 3150
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR033
+L VCC #PWR
 U 1 1 442A4D41
 P 3450 1250
-F 0 "#PWR033" H 3450 1350 30  0001 C C
+F 0 "#PWR" H 3450 1350 30  0001 C C
 F 1 "VCC" H 3450 1350 30  0000 C C
 	1    3450 1250
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR034
+L GND #PWR
 U 1 1 442A4D3B
 P 3450 2200
-F 0 "#PWR034" H 3450 2200 30  0001 C C
+F 0 "#PWR" H 3450 2200 30  0001 C C
 F 1 "GND" H 3450 2130 30  0001 C C
 	1    3450 2200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR035
+L GND #PWR
 U 1 1 442A4D38
 P 3950 2000
-F 0 "#PWR035" H 3950 2000 30  0001 C C
+F 0 "#PWR" H 3950 2000 30  0001 C C
 F 1 "GND" H 3950 1930 30  0001 C C
 	1    3950 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L DIODESCH D3
+L DIODESCH D
 U 1 1 442A4D25
 P 3450 2000
-F 0 "D3" H 3450 2100 40  0000 C C
+F 0 "D" H 3450 2100 40  0000 C C
 F 1 "BAT43" H 3450 1900 40  0000 C C
 	1    3450 2000
 	0    -1   -1   0   
 $EndComp
 $Comp
-L DIODESCH D2
+L DIODESCH D
 U 1 1 442A4D1B
 P 3450 1450
-F 0 "D2" H 3450 1550 40  0000 C C
+F 0 "D" H 3450 1550 40  0000 C C
 F 1 "BAT43" H 3450 1350 40  0000 C C
 	1    3450 1450
 	0    -1   -1   0   
 $EndComp
 $Comp
-L R R2
+L R R
 U 1 1 442A4CFB
 P 2800 2000
-F 0 "R2" V 2880 2000 50  0000 C C
+F 0 "R" V 2880 2000 50  0000 C C
 F 1 "10K" V 2800 2000 50  0000 C C
 	1    2800 2000
 	1    0    0    -1  
 $EndComp
 $Comp
-L R R1
+L R R
 U 1 1 442A4CF4
 P 3100 1700
-F 0 "R1" V 3180 1700 50  0000 C C
+F 0 "R" V 3180 1700 50  0000 C C
 F 1 "10K" V 3100 1700 50  0000 C C
 	1    3100 1700
 	0    -1   -1   0   
 $EndComp
 $Comp
-L 74LS125 U2
+L 74LS125 U
 U 1 1 442A4CC8
 P 3950 1700
-F 0 "U2" H 3950 1800 50  0000 L B
+F 0 "U" H 3950 1800 50  0000 L B
 F 1 "74HC125" H 4000 1550 40  0000 L T
 	1    3950 1700
 	1    0    0    -1  
 $EndComp
 $Comp
-L DB9 J1
+L DB9 J
 U 1 1 442A4C93
 P 1250 3600
-F 0 "J1" H 1250 4150 70  0000 C C
+F 0 "J" H 1250 4150 70  0000 C C
 F 1 "DB9-FEMAL" H 1250 3050 70  0000 C C
 	1    1250 3600
 	-1   0    0    1   
diff --git a/demos/pic_programmer/pic_sockets.sch b/demos/pic_programmer/pic_sockets.sch
index 09f500e42e..64880c980f 100644
--- a/demos/pic_programmer/pic_sockets.sch
+++ b/demos/pic_programmer/pic_sockets.sch
@@ -1,9 +1,9 @@
-EESchema Schematic File Version 1
-LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,.\pic_programmer.cache
+EESchema Schematic File Version 2
+LIBS:power,device,conn,linear,regul,74xx,cmos4000,adc-dac,memory,xilinx,special,microcontrollers,dsp,microchip,analog_switches,motorola,texas,intel,audio,interface,digital-audio,philips,display,cypress,siliconi,contrib,valves,./pic_programmer.cache
 EELAYER 23  0
 EELAYER END
 $Descr A4 11700 8267
-Sheet 2 2
+Sheet 1 1
 Title "JDM - COM84 PIC Programmer with 13V DC/DC converter"
 Date "16 may 2007"
 Rev "3"
@@ -74,24 +74,24 @@ Wire Wire Line
 Text Label 3950 6900 0    60   ~
 VCC_PIC
 $Comp
-L GND #PWR036
+L GND #PWR
 U 1 1 4639BE2E
 P 4550 7400
-F 0 "#PWR036" H 4550 7400 30  0001 C C
+F 0 "#PWR" H 4550 7400 30  0001 C C
 F 1 "GND" H 4550 7330 30  0001 C C
 	1    4550 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C8
+L C C
 U 1 1 4639BE2C
 P 4550 7200
-F 0 "C8" H 4600 7300 50  0000 L C
+F 0 "C" H 4600 7300 50  0000 L C
 F 1 "100nF" H 4600 7100 50  0000 L C
 	1    4550 7200
 	1    0    0    -1  
 $EndComp
-Text GLabel 2350 2150 0    60   Input
+Text HLabel 2350 2150 0    60   Input
 VCC_PIC
 Text Label 2550 2150 0    60   ~
 VCC_PIC
@@ -102,10 +102,10 @@ VCC_PIC
 Text Label 9650 2500 0    60   ~
 VCC_PIC
 $Comp
-L GND #PWR037
+L GND #PWR
 U 1 1 442A8794
 P 8450 5250
-F 0 "#PWR037" H 8450 5250 30  0001 C C
+F 0 "#PWR" H 8450 5250 30  0001 C C
 F 1 "GND" H 8450 5180 30  0001 C C
 	1    8450 5250
 	0    1    1    0   
@@ -113,10 +113,10 @@ $EndComp
 Text Label 4300 4850 0    60   ~
 VCC_PIC
 $Comp
-L GND #PWR038
+L GND #PWR
 U 1 1 443CCA5D
 P 8450 4850
-F 0 "#PWR038" H 8450 4850 30  0001 C C
+F 0 "#PWR" H 8450 4850 30  0001 C C
 F 1 "GND" H 8450 4780 30  0001 C C
 	1    8450 4850
 	0    1    1    0   
@@ -144,19 +144,19 @@ NoConn ~ 8200 2000
 NoConn ~ 8200 1900
 NoConn ~ 8200 1800
 $Comp
-L GND #PWR039
+L GND #PWR
 U 1 1 443697C7
 P 9400 2600
-F 0 "#PWR039" H 9400 2600 30  0001 C C
+F 0 "#PWR" H 9400 2600 30  0001 C C
 F 1 "GND" H 9400 2530 30  0001 C C
 	1    9400 2600
 	0    -1   -1   0   
 $EndComp
 $Comp
-L GND #PWR040
+L GND #PWR
 U 1 1 443697C3
 P 8200 2400
-F 0 "#PWR040" H 8200 2400 30  0001 C C
+F 0 "#PWR" H 8200 2400 30  0001 C C
 F 1 "GND" H 8200 2330 30  0001 C C
 	1    8200 2400
 	0    1    1    0   
@@ -168,55 +168,55 @@ DATA-RB7
 Text Label 7550 1700 0    60   ~
 VPP-MCLR
 $Comp
-L SUPP28 P2
+L SUPP28 P
 U 1 1 4436967E
 P 8800 2350
-F 0 "P2" H 8850 3150 70  0000 C C
+F 0 "P" H 8850 3150 70  0000 C C
 F 1 "SUPP28" H 8800 1550 70  0000 C C
 	1    8800 2350
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR041
+L GND #PWR
 U 1 1 442AA147
 P 3700 7400
-F 0 "#PWR041" H 3700 7400 30  0001 C C
+F 0 "#PWR" H 3700 7400 30  0001 C C
 F 1 "GND" H 3700 7330 30  0001 C C
 	1    3700 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C7
+L C C
 U 1 1 442AA145
 P 3700 7200
-F 0 "C7" H 3750 7300 50  0000 L C
+F 0 "C" H 3750 7300 50  0000 L C
 F 1 "100nF" H 3750 7100 50  0000 L C
 	1    3700 7200
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR042
+L GND #PWR
 U 1 1 442AA138
 P 2700 7400
-F 0 "#PWR042" H 2700 7400 30  0001 C C
+F 0 "#PWR" H 2700 7400 30  0001 C C
 F 1 "GND" H 2700 7330 30  0001 C C
 	1    2700 7400
 	1    0    0    -1  
 $EndComp
 $Comp
-L VCC #PWR043
+L VCC #PWR
 U 1 1 442AA134
 P 2700 7000
-F 0 "#PWR043" H 2700 7100 30  0001 C C
+F 0 "#PWR" H 2700 7100 30  0001 C C
 F 1 "VCC" H 2700 7100 30  0000 C C
 	1    2700 7000
 	1    0    0    -1  
 $EndComp
 $Comp
-L C C6
+L C C
 U 1 1 442AA12B
 P 2700 7200
-F 0 "C6" H 2750 7300 50  0000 L C
+F 0 "C" H 2750 7300 50  0000 L C
 F 1 "100nF" H 2750 7100 50  0000 L C
 	1    2700 7200
 	1    0    0    -1  
@@ -254,29 +254,29 @@ NoConn ~ 8450 4450
 NoConn ~ 8450 4350
 NoConn ~ 8450 4250
 $Comp
-L GND #PWR044
+L GND #PWR
 U 1 1 442A896A
 P 9650 5050
-F 0 "#PWR044" H 9650 5050 30  0001 C C
+F 0 "#PWR" H 9650 5050 30  0001 C C
 F 1 "GND" H 9650 4980 30  0001 C C
 	1    9650 5050
 	0    -1   -1   0   
 $EndComp
 $Comp
-L SUPP40 P3
+L SUPP40 P
 U 1 1 442A88ED
 P 9050 5100
-F 0 "P3" H 9100 6200 70  0000 C C
+F 0 "P" H 9100 6200 70  0000 C C
 F 1 "SUPP40" H 8900 4000 70  0000 C C
 	1    9050 5100
 	1    0    0    -1  
 $EndComp
 NoConn ~ 4550 1100
 $Comp
-L GND #PWR045
+L GND #PWR
 U 1 1 442A8838
 P 2950 1250
-F 0 "#PWR045" H 2950 1250 30  0001 C C
+F 0 "#PWR" H 2950 1250 30  0001 C C
 F 1 "GND" H 2950 1180 30  0001 C C
 	1    2950 1250
 	1    0    0    -1  
@@ -286,10 +286,10 @@ DATA-RB7
 Text Label 4700 1300 0    60   ~
 CLOCK-RB6
 $Comp
-L 24C16 U1
+L 24C16 U
 U 1 1 442A87F7
 P 3850 1200
-F 0 "U1" H 4000 1550 60  0000 C C
+F 0 "U" H 4000 1550 60  0000 C C
 F 1 "24Cxx" H 4050 850 60  0000 C C
 	1    3850 1200
 	1    0    0    -1  
@@ -314,10 +314,10 @@ NoConn ~ 2500 5000
 NoConn ~ 2500 4550
 NoConn ~ 2500 4250
 $Comp
-L PIC16F54 U5
+L PIC16F54 U
 U 1 1 442A81A7
 P 3300 4850
-F 0 "U5" H 3600 5650 60  0000 C C
+F 0 "U" H 3600 5650 60  0000 C C
 F 1 "PIC_18_PINS" H 3750 4050 60  0000 C C
 	1    3300 4850
 	1    0    0    -1  
@@ -337,35 +337,35 @@ Text Label 4700 2850 0    60   ~
 CLOCK-RB6
 Text Label 4700 2450 0    60   ~
 DATA-RB7
-Text GLabel 1350 4450 0    60   Input
+Text HLabel 1350 4450 0    60   Input
 VPP-MCLR
-Text GLabel 1350 4250 0    60   Input
+Text HLabel 1350 4250 0    60   Input
 CLOCK-RB6
-Text GLabel 1350 4050 0    60   Input
+Text HLabel 1350 4050 0    60   Input
 DATA-RB7
 $Comp
-L GND #PWR046
+L GND #PWR
 U 1 1 442A820F
 P 2300 4900
-F 0 "#PWR046" H 2300 4900 30  0001 C C
+F 0 "#PWR" H 2300 4900 30  0001 C C
 F 1 "GND" H 2300 4830 30  0001 C C
 	1    2300 4900
 	1    0    0    -1  
 $EndComp
 $Comp
-L GND #PWR047
+L GND #PWR
 U 1 1 442A8205
 P 4550 2150
-F 0 "#PWR047" H 4550 2150 30  0001 C C
+F 0 "#PWR" H 4550 2150 30  0001 C C
 F 1 "GND" H 4550 2080 30  0001 C C
 	1    4550 2150
 	0    -1   -1   0   
 $EndComp
 $Comp
-L PIC12C508A U6
+L PIC12C508A U
 U 1 1 442A81A5
 P 3850 2650
-F 0 "U6" H 3800 3350 60  0000 C C
+F 0 "U" H 3800 3350 60  0000 C C
 F 1 "PIC_8_PINS" H 3850 1950 60  0000 C C
 	1    3850 2650
 	1    0    0    -1  
diff --git a/eeschema/general.h b/eeschema/general.h
index 34c85983ad..d0ae461f8a 100644
--- a/eeschema/general.h
+++ b/eeschema/general.h
@@ -11,7 +11,7 @@
 #define ul unsigned long
 
 /* Entete des fichiers schematique */
-#define EESCHEMA_VERSION 1
+#define EESCHEMA_VERSION 2
 
 #define SCHEMATIC_HEAD_STRING "Schematic File Version"
 #define EESCHEMA_FILE_STAMP  "EESchema"
diff --git a/eeschema/load_one_schematic_file.cpp b/eeschema/load_one_schematic_file.cpp
index 13bd3a1e74..5a30b092bc 100644
--- a/eeschema/load_one_schematic_file.cpp
+++ b/eeschema/load_one_schematic_file.cpp
@@ -118,7 +118,8 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
         fclose( f );
         return FALSE;
     }
-
+	//get the file version here. 
+	char version = Line[9 + sizeof(SCHEMATIC_HEAD_STRING)]; 
     LineCount++;
     if( fgets( Line, 1024 - 1, f ) == NULL || strncmp( Line, "LIBS:", 5 ) != 0 )
     {
@@ -381,7 +382,7 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
                     TextStruct->m_Orient = orient;
                     Struct = (EDA_BaseStruct*) TextStruct;
                 }
-				else if( Name1[0] == 'G')
+				else if( Name1[0] == 'G' && version > '1')
                 {
                     DrawGlobalLabelStruct* TextStruct =
                         new DrawGlobalLabelStruct(pos, CONV_FROM_UTF8( text ) );
@@ -397,8 +398,8 @@ bool WinEDA_SchematicFrame::LoadOneEEFile( SCH_SCREEN* screen, const wxString& F
                     if( stricmp( Name2, SheetLabelType[NET_UNSPECIFIED] ) == 0 )
                         TextStruct->m_Shape = NET_UNSPECIFIED;
                 }
-				else if( Name1[0] == 'H')
-                {
+				else if( (Name1[0] == 'H') || (Name1[0] == 'G' && version == '1'))
+                { //in sschematic file version 1, glabels were actually hierarchal labels. 
                     DrawHierLabelStruct* TextStruct =
                         new DrawHierLabelStruct(pos, CONV_FROM_UTF8( text ) );
                     Struct = (EDA_BaseStruct*) TextStruct;
diff --git a/eeschema/netlist.cpp b/eeschema/netlist.cpp
index 9a9b058b34..2a2c755b4e 100644
--- a/eeschema/netlist.cpp
+++ b/eeschema/netlist.cpp
@@ -1098,15 +1098,16 @@ static void LabelConnect( ObjetNetListStruct* LabelRef )
 
 		if( netTable[i].m_SheetList != LabelRef->m_SheetList )
         {
-            if( netTable[i].m_Type != NET_PINLABEL 
+            if( netTable[i].m_Type != NET_LABEL // (***)
+			    && netTable[i].m_Type != NET_PINLABEL 
 				&& netTable[i].m_Type != NET_GLOBLABEL
 				&& netTable[i].m_Type != NET_GLOBBUSLABELMEMBER) 
                 continue;
         }
 		//regular labels are sheet-local; 
 		//NET_HIERLABEL are used to connect sheets. 
-		//there are no true global labels yet, 
-		//though I've (tried) to implement them in this file.
+		//NET_LABEL can be either sheet-local or global. 
+		//historically, it was global, so we must implement that (***)
 		if( netTable[i].m_Type == NET_LABEL
          || netTable[i].m_Type == NET_GLOBLABEL
          || netTable[i].m_Type == NET_BUSLABELMEMBER
diff --git a/eeschema/sheetlab.cpp b/eeschema/sheetlab.cpp
index d259c8201a..427a277a78 100644
--- a/eeschema/sheetlab.cpp
+++ b/eeschema/sheetlab.cpp
@@ -358,6 +358,7 @@ DrawSheetLabelStruct* WinEDA_SchematicFrame::Import_PinSheet( DrawSheetStruct* S
     DrawSheetLabelStruct* 	NewSheetLabel, * SheetLabel = NULL;
     DrawHierLabelStruct* 	HLabel = NULL;
 
+	if(!Sheet->m_s) return NULL; 
     DrawStruct = Sheet->m_s->EEDrawList;
     HLabel = NULL;
     for( ; DrawStruct != NULL; DrawStruct = DrawStruct->Pnext )