diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 4b267636d1bd..3802f5e45098 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -160,7 +160,7 @@ include $(GBUILDDIR)/platform/freebsd-$(CPUNAME).mk
 else ifeq ($(OS),NETBSD)
 include $(GBUILDDIR)/platform/netbsd-$(CPUNAME).mk
 else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly-$(CPUNAME).mk
+include $(GBUILDDIR)/platform/dragonfly.mk
 else ifeq ($(OS),SOLARIS)
 include $(GBUILDDIR)/platform/solaris.mk
 else
diff --git a/solenv/gbuild/platform/dragonfly-INTEL.mk b/solenv/gbuild/platform/dragonfly-INTEL.mk
deleted file mode 100755
index 99d821b66a4b..000000000000
--- a/solenv/gbuild/platform/dragonfly-INTEL.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Initial Developer of the Original Code is
-#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-#*************************************************************************
-
-#please make generic modifications to unxgcc.mk
-gb_CPUDEFS := -DX86
-gb_Library_DLLPOSTFIX := df
-gb_COMPILERDEFAULTOPTFLAGS := -Os
-
-include $(GBUILDDIR)/platform/unxgcc.mk
-
-# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/dragonfly-X86_64.mk b/solenv/gbuild/platform/dragonfly.mk
similarity index 100%
rename from solenv/gbuild/platform/dragonfly-X86_64.mk
rename to solenv/gbuild/platform/dragonfly.mk