diff --git a/inxi b/inxi
index a1bfb11..f6a3d8a 100755
--- a/inxi
+++ b/inxi
@@ -2,7 +2,7 @@
 ########################################################################
 ####  Script Name: inxi
 ####  Version: 2.1.28
-####  Date: 2014-05-05
+####  Date: 2014-05-21
 ####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
@@ -1672,6 +1672,8 @@ debug_data_collector()
 		ls /usr/bin/gcc* &> $debug_data_dir/gcc-sys-versions.txt
 		gcc --version &> $debug_data_dir/gcc-version.txt
 		clang --version &> $debug_data_dir/clang-version.txt
+		cat /etc/src.conf &> $debug_data_dir/bsd-etc-src-conf.txt
+		cat /etc/make.conf &> $debug_data_dir/bsd-etc-make-conf.txt
 		cat /etc/issue &> $debug_data_dir/etc-issue.txt
 		cat $FILE_LSB_RELEASE &> $debug_data_dir/lsb-release.txt
 		cat $FILE_OS_RELEASE &> $debug_data_dir/os-release.txt
@@ -4254,7 +4256,7 @@ get_desktop_environment()
 			desktop_environment="MATE"
 		# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
 		# https://bugzilla.gnome.org/show_bug.cgi?id=542880
-		elif [[ -n $GNOME_DESKTOP_SESSION_ID ]]; then
+		elif [[ -n $GNOME_DESKTOP_SESSION_ID || $XDG_CURRENT_DESKTOP == 'GNOME' ]]; then
 			if type -p gnome-shell &>/dev/null;then
 				version=$( get_program_version 'gnome-shell' 'gnome' '3' )
 			elif type -p gnome-about &>/dev/null;then