diff --git a/acinclude.m4 b/acinclude.m4
index e1475f2..5e1122b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -90,7 +90,7 @@ AC_ARG_WITH(boxmodel,
 	AS_HELP_STRING([--with-boxmodel], [valid for generic: generic, raspi])
 AS_HELP_STRING([], [valid for spark: spark, spark7162])
 AS_HELP_STRING([], [valid for duckbox: ufs910, ufs912, ufs913, ufs922, atevio7500, fortis_hdbox, octagon1008, hs7110, hs7810a, hs7119, hs7819, dp7000, cuberevo, cuberevo_mini, cuberevo_mini2, cuberevo_250hd, cuberevo_2000hd, cuberevo_3000hd, ipbox9900, ipbox99, ipbox55, arivalink200, tf7700, hl101])
-AS_HELP_STRING([], [valid for armbox: hd51, hd60, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
+AS_HELP_STRING([], [valid for armbox: hd51, hd60, hd61, bre2ze4k, h7, osmio4k, osmio4kplus, vusolo4k, vuduo4k, vuultimo4k, vuuno4k, vuuno4kse, vuzero4k])
 AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 	[case "${withval}" in
 		generic|raspi)
@@ -114,7 +114,7 @@ AS_HELP_STRING([], [valid for mipsbox: vuduo]),
 				AC_MSG_ERROR([unknown model $withval for boxtype $BOXTYPE])
 			fi
 		;;
-		hd51|hd60|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
+		hd51|hd60|hd61|bre2ze4k|h7|osmio4k|osmio4kplus|vusolo4k|vuduo4k|vuultimo4k|vuuno4k|vuuno4kse|vuzero4k)
 			if test "$BOXTYPE" = "armbox"; then
 				BOXMODEL="$withval"
 			else
@@ -185,6 +185,7 @@ AM_CONDITIONAL(BOXMODEL_HL101, test "$BOXMODEL" = "hl101")
 # armbox
 AM_CONDITIONAL(BOXMODEL_HD51, test "$BOXMODEL" = "hd51")
 AM_CONDITIONAL(BOXMODEL_HD60, test "$BOXMODEL" = "hd60")
+AM_CONDITIONAL(BOXMODEL_HD61, test "$BOXMODEL" = "hd61")
 AM_CONDITIONAL(BOXMODEL_BRE2ZE4K, test "$BOXMODEL" = "bre2ze4k")
 AM_CONDITIONAL(BOXMODEL_H7, test "$BOXMODEL" = "h7")
 AM_CONDITIONAL(BOXMODEL_OSMIO4K, test "$BOXMODEL" = "osmio4k")
@@ -278,6 +279,8 @@ elif test "$BOXMODEL" = "hd51"; then
 	AC_DEFINE(BOXMODEL_HD51, 1, [hd51])
 elif test "$BOXMODEL" = "hd60"; then
 	AC_DEFINE(BOXMODEL_HD60, 1, [hd60])
+elif test "$BOXMODEL" = "hd61"; then
+	AC_DEFINE(BOXMODEL_HD61, 1, [hd61])
 elif test "$BOXMODEL" = "bre2ze4k"; then
 	AC_DEFINE(BOXMODEL_BRE2ZE4K, 1, [bre2ze4k])
 elif test "$BOXMODEL" = "h7"; then
@@ -337,6 +340,18 @@ case "$BOXMODEL" in
 	;;
 esac
 AM_CONDITIONAL(BOXMODEL_VUPLUS_MIPS, test "$vuplus_mips" = "true")
+
+# all hisilicon BOXMODELs
+case "$BOXMODEL" in
+	hd60|hd61)
+		AC_DEFINE(BOXMODEL_HISILICON, 1, [hisilicon])
+		hisilicon=true
+	;;
+	*)
+		hisilicon=false
+	;;
+esac
+AM_CONDITIONAL(BOXMODEL_HISILICON, test "$hisilicon" = "true")
 ])
 
 dnl backward compatiblity
diff --git a/libarmbox/Makefile.am b/libarmbox/Makefile.am
index a16e9cd..26e4d9d 100644
--- a/libarmbox/Makefile.am
+++ b/libarmbox/Makefile.am
@@ -32,7 +32,7 @@ AM_LDFLAGS += \
 	-lgsttag-1.0 \
 	-lgstmpegts-1.0
 else
-if BOXMODEL_HD60
+if BOXMODEL_HISILICON
 libarmbox_la_SOURCES += \
 	playback_hisilicon.cpp
 else
diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp
index 6553e46..4df9fc8 100644
--- a/libarmbox/audio.cpp
+++ b/libarmbox/audio.cpp
@@ -137,7 +137,7 @@ int cAudio::Start(void)
 {
 	int ret;
 	ret = ioctl(fd, AUDIO_PLAY);
-#ifdef BOXMODEL_HD60 || BOXMODEL_HD61
+#if BOXMODEL_HISILICON
 	ioctl(fd, AUDIO_CONTINUE);
 #endif
 	return ret;
diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp
index f41de42..9e5b983 100644
--- a/libarmbox/video.cpp
+++ b/libarmbox/video.cpp
@@ -541,7 +541,7 @@ int cVideo::Start(void * /*PcrChannel*/, unsigned short /*PcrPid*/, unsigned sho
 	playstate = VIDEO_PLAYING;
 	fop(ioctl, VIDEO_SELECT_SOURCE, VIDEO_SOURCE_DEMUX);
 	int res = fop(ioctl, VIDEO_PLAY);
-#ifdef BOXMODEL_HD60 || BOXMODEL_HD61
+#if BOXMODEL_HISILICON
 	fop(ioctl, VIDEO_CONTINUE);
 #endif
 	if (brightness > -1) {