diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -92,7 +92,8 @@
 .endif
 .endif
 
-.if ${PORT_OPTIONS:MPYTHON} && exists(/usr/lib/libc++.so.1)
+.if ${PORT_OPTIONS:MPYTHON} && \
+    (exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1))
 USE_GITHUB=	nodefault
 
 GH_ACCOUNT=	bsdjhb:libcxx
@@ -102,6 +103,13 @@
 # Workaround USE_GITHUB preventing the default DISTFILES
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
+.if exists(/usr/lib/libc++.so.1)
+LIBCXX_DIR=	/usr/lib
+.else
+LIBCXX_DIR=	/lib
+.endif
+
+PLIST_SUB+=	LIBCXX_DIR="${LIBCXX_DIR}"
 PLIST_SUB+=	LIBCXX=""
 .else
 PLIST_SUB+=	LIBCXX="@comment "
@@ -162,10 +170,11 @@
 . for f in gdb gdb/command gdb/function gdb/printer
 	@(cd ${STAGEDIR}${PREFIX}/share/gdb/python/${f} ; ${CHMOD} 644 *.py* )
 . endfor
-.if exists(/usr/lib/libc++.so.1)
+.if exists(/usr/lib/libc++.so.1) || exists(/lib/libc++.so.1)
 	@(cd ${WRKSRC_libcxx} ; \
-		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} install )
-	@(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/usr/lib && \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} \
+		    LIBCXX_DIR="${LIBCXX_DIR}" install )
+	@(cd ${STAGEDIR}${PREFIX}/share/gdb/auto-load/${LIBCXX_DIR} && \
 		${PYTHON_CMD} -m compileall .)
 	@(cd ${STAGEDIR}${PREFIX}/share/libcxx-gdbpy/libcxx && \
 		${PYTHON_CMD} -m compileall .)
diff --git a/devel/gdb/pkg-plist b/devel/gdb/pkg-plist
--- a/devel/gdb/pkg-plist
+++ b/devel/gdb/pkg-plist
@@ -7,8 +7,8 @@
 man/man1/gdb%%VER%%.1.gz
 %%GDB_LINK%%%%KGDB%%man/man1/kgdb.1.gz
 %%KGDB%%man/man1/kgdb%%VER%%.1.gz
-%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.py
-%%LIBCXX%%%%DATADIR%%/auto-load/usr/lib/libc++.so.1-gdb.pyc
+%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.py
+%%LIBCXX%%%%DATADIR%%/auto-load%%LIBCXX_DIR%%/libc++.so.1-gdb.pyc
 %%PYTHON%%%%DATADIR%%/python/gdb/__init__.py
 %%PYTHON%%%%DATADIR%%/python/gdb/__init__.pyc
 %%PYTHON%%%%DATADIR%%/python/gdb/FrameDecorator.py