diff --git a/build b/build
index 6e35079..e55ab93 100755
--- a/build
+++ b/build
@@ -49,13 +49,12 @@ select_boards()
     local choice
     local call=${1}
 
-    boards=("orangepir1" "orangepizero" "orangepipc" "orangepipcplus" "orangepiplus2e" "orangepione" "orangepilite" "orangepiplus" "orangepizeroplus" "orangepizeroplus2h3" "orangepipc2" "orangepiprime" "orangepizeroplus2h5" "orangepiwin" "orangepiwinplus" "orangepi3" "orangepilite2" "orangepioneplus" "orangepi4" "orangepirk3399")
+    boards=("orangepir1" "orangepizero" "orangepipc" "orangepipcplus" "orangepiplus2e" "orangepione" "orangepilite" "orangepiplus" "orangepizeroplus2h3" "orangepizeroplus" "orangepipc2" "orangepiprime" "orangepizeroplus2h5" "orangepiwin" "orangepiwinplus" "orangepi3" "orangepilite2" "orangepioneplus" "orangepi4" "orangepirk3399")
 
     if [[ -f /etc/orangepi-release ]]; then 
 
 	source /etc/orangepi-release
-	export BOARD="${BOARD}"
-	
+
     elif [[ -f /etc/armbian-release ]]; then
 
 	source /etc/armbian-release
@@ -65,8 +64,6 @@ select_boards()
 	[[ $BOARD == orangepizeroplus2-h3 ]] && BOARD=orangepizeroplus2h3
 	[[ $BOARD == orangepizeroplus2-h5 ]] && BOARD=orangepizeroplus2h5
 
-	export BOARD="${BOARD}"
-
     else
 
 	printf "All available boards:\n"
@@ -89,6 +86,25 @@ select_boards()
         	printf "Invalid input ...\n"
     	done
     fi
+
+	[[ $BOARD == orangepir1 ]] && BOARD=orangepir1-h2
+	[[ $BOARD == orangepizero ]] && BOARD=orangepizero-h2
+	[[ $BOARD == orangepipc ]] && BOARD=orangepipc-h3
+	[[ $BOARD == orangepipcplus ]] && BOARD=orangepipcplus-h3
+	[[ $BOARD == orangepiplus2e ]] && BOARD=orangepiplus2e-h3
+	[[ $BOARD == orangepione ]] && BOARD=orangepione-h3
+	[[ $BOARD == orangepilite ]] && BOARD=orangepilite-h3
+	[[ $BOARD == orangepiplus ]] && BOARD=orangepiplus-h3
+	[[ $BOARD == orangepizeroplus ]] && BOARD=orangepizeroplus-h5
+	[[ $BOARD == orangepipc2 ]] && BOARD=orangepipc2-h5
+	[[ $BOARD == orangepiprime ]] && BOARD=orangepiprime-h5
+	[[ $BOARD == orangepiwin ]] && BOARD=orangepiwin-a64
+	[[ $BOARD == orangepiwinplus ]] && BOARD=orangepiwinplus-a64
+	[[ $BOARD == orangepi3 ]] && BOARD=orangepi3-h6
+	[[ $BOARD == orangepilite2 ]] && BOARD=orangepilite2-h6
+	[[ $BOARD == orangepioneplus ]] && BOARD=orangepioneplus-h6
+
+	export BOARD="${BOARD}"
 }
 
 sudo=${WIRINGPI_SUDO-sudo}
diff --git a/gpio/Makefile b/gpio/Makefile
index 7a9e251..9d07b8b 100755
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -40,42 +40,42 @@ LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
 
 ifeq ($(BOARD),)
-  BOARD = orangepioneplus
+  BOARD = orangepioneplus-h6
 endif
 
 ifeq ($(BOARD), orangepi2giot)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_2G_IOT
 endif
 
-ifneq ($(findstring $(BOARD), "orangepione" "orangepilite" "orangepipc" "orangepiplus" "orangepipcplus" "orangepiplus2e"),)
+ifneq ($(findstring $(BOARD), "orangepione-h3" "orangepilite-h3" "orangepipc-h3" "orangepiplus-h3" "orangepipcplus-h3" "orangepiplus2e-h3"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_H3
 endif
 
-ifeq ($(BOARD), orangepipc2)
+ifeq ($(BOARD), orangepipc2-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_PC2
 endif
 
-ifeq ($(BOARD), orangepiprime)
+ifeq ($(BOARD), orangepiprime-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_PRIME
 endif
 
-ifeq ($(BOARD), orangepizeroplus)
+ifeq ($(BOARD), orangepizeroplus-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_ZEROPLUS
 endif
 
-ifneq ($(findstring $(BOARD), "orangepiwin" "orangepiwinplus"),)
+ifneq ($(findstring $(BOARD), "orangepiwin-a64" "orangepiwinplus-a64"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_WIN
 endif
 
-ifneq ($(findstring $(BOARD), "orangepizero" "orangepir1"),)
+ifneq ($(findstring $(BOARD), "orangepizero-h2" "orangepir1-h2"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_ZERO
 endif
 
-ifneq ($(findstring $(BOARD), "orangepioneplus" "orangepilite2"),)
+ifneq ($(findstring $(BOARD), "orangepioneplus-h6" "orangepilite2-h6"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_LITE2
 endif
 
-ifeq ($(BOARD), orangepi3)
+ifeq ($(BOARD), orangepi3-h6)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_3
 endif
 
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index 5677e05..812bcfc 100755
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -45,42 +45,42 @@ CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wextra -Winline $(INCLUDE) -pipe -fPIC
 LIBS    = -lm -lpthread -lrt -lcrypt
 
 ifeq ($(BOARD),)
-  BOARD = orangepioneplus
+  BOARD = orangepioneplus-h6
 endif
 
 ifeq ($(BOARD), orangepi2giot)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_2G_IOT
 endif
 
-ifeq ($(BOARD), orangepipc2)
+ifeq ($(BOARD), orangepipc2-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_PC2
 endif
 
-ifeq ($(BOARD), orangepiprime)
+ifeq ($(BOARD), orangepiprime-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_PRIME
 endif
 
-ifeq ($(BOARD), orangepizeroplus)
+ifeq ($(BOARD), orangepizeroplus-h5)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_ZEROPLUS
 endif
 
-ifneq ($(findstring $(BOARD), "orangepiwin" "orangepiwinplus"),)
+ifneq ($(findstring $(BOARD), "orangepiwin-a64" "orangepiwinplus-a64"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_WIN
 endif
 
-ifneq ($(findstring $(BOARD), "orangepione" "orangepilite" "orangepipc" "orangepiplus" "orangepipcplus" "orangepiplus2e"),)
+ifneq ($(findstring $(BOARD), "orangepione-h3" "orangepilite-h3" "orangepipc-h3" "orangepiplus-h3" "orangepipcplus-h3" "orangepiplus2e-h3"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_H3
 endif
 
-ifneq ($(findstring $(BOARD), "orangepizero" "orangepir1"),)
+ifneq ($(findstring $(BOARD), "orangepizero-h2" "orangepir1-h2"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_ZERO
 endif
 
-ifneq ($(findstring $(BOARD), "orangepioneplus" "orangepilite2"),)
+ifneq ($(findstring $(BOARD), "orangepioneplus-h6" "orangepilite2-h6"),)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_LITE2
 endif
 
-ifeq ($(BOARD), orangepi3)
+ifeq ($(BOARD), orangepi3-h6)
 EXTRA_CFLAGS = -DCONFIG_ORANGEPI_3
 endif
 
@@ -226,5 +226,3 @@ wpiExtensions.o: mcp23s17.h sr595.h pcf8574.h pcf8591.h mcp3002.h mcp3004.h
 wpiExtensions.o: mcp4802.h mcp3422.h max31855.h max5322.h ads1115.h sn3218.h
 wpiExtensions.o: drcSerial.h pseudoPins.h bmp180.h htu21d.h ds18b20.h
 wpiExtensions.o: wpiExtensions.h
-
-