diff --git a/sbin/ifconfig/ifieee80211.c b/sbin/ifconfig/ifieee80211.c
index ccb650c6e99c..48201bd74efa 100644
--- a/sbin/ifconfig/ifieee80211.c
+++ b/sbin/ifconfig/ifieee80211.c
@@ -3429,9 +3429,9 @@ get_chaninfo(const struct ieee80211_channel *c, int precise,
 	else if (IEEE80211_IS_CHAN_B(c))
 		strlcat(buf, " 11b", bsize);
 	if (IEEE80211_IS_CHAN_HALF(c))
-		strlcat(buf, "/10Mhz", bsize);
+		strlcat(buf, "/10MHz", bsize);
 	if (IEEE80211_IS_CHAN_QUARTER(c))
-		strlcat(buf, "/5Mhz", bsize);
+		strlcat(buf, "/5MHz", bsize);
 	if (IEEE80211_IS_CHAN_TURBO(c))
 		strlcat(buf, " Turbo", bsize);
 	if (precise) {
@@ -3453,7 +3453,7 @@ print_chaninfo(const struct ieee80211_channel *c, int verb)
 {
 	char buf[14];
 
-	printf("Channel %3u : %u%c Mhz%-14.14s",
+	printf("Channel %3u : %u%c MHz%-14.14s",
 		ieee80211_mhz2ieee(c->ic_freq, c->ic_flags), c->ic_freq,
 		IEEE80211_IS_CHAN_PASSIVE(c) ? '*' : ' ',
 		get_chaninfo(c, verb, buf, sizeof(buf)));
@@ -3562,7 +3562,7 @@ list_channels(int s, int allchans)
 static void
 print_txpow(const struct ieee80211_channel *c)
 {
-	printf("Channel %3u : %u Mhz %3.1f reg %2d  ",
+	printf("Channel %3u : %u MHz %3.1f reg %2d  ",
 	    c->ic_ieee, c->ic_freq,
 	    c->ic_maxpower/2., c->ic_maxregpower);
 }
@@ -4244,7 +4244,7 @@ ieee80211_status(int s)
 	c = getcurchan(s);
 	if (c->ic_freq != IEEE80211_CHAN_ANY) {
 		char buf[14];
-		printf(" channel %d (%u Mhz%s)", c->ic_ieee, c->ic_freq,
+		printf(" channel %d (%u MHz%s)", c->ic_ieee, c->ic_freq,
 			get_chaninfo(c, 1, buf, sizeof(buf)));
 	} else if (verbose)
 		printf(" channel UNDEF");
diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4
index cfc256c84d83..c2344cba4195 100644
--- a/share/man/man4/ath.4
+++ b/share/man/man4/ath.4
@@ -249,7 +249,7 @@ This should not happen.
 An invalid transmit rate was specified for an outgoing frame.
 The frame is discarded.
 This should not happen.
-.It "ath%d: ath_chan_set: unable to reset channel %u (%u Mhz)"
+.It "ath%d: ath_chan_set: unable to reset channel %u (%u MHz)"
 The Atheros Hardware Access Layer was unable to reset the hardware
 when switching channels during scanning.
 This should not happen.
diff --git a/share/man/man4/cpufreq.4 b/share/man/man4/cpufreq.4
index aa1da043fc42..bd6885eb4f5b 100644
--- a/share/man/man4/cpufreq.4
+++ b/share/man/man4/cpufreq.4
@@ -234,7 +234,7 @@ The driver should set unknown or irrelevant values to
 All the following elements for each setting should be returned:
 .Bd -literal
 struct cf_setting {
-	int	freq;	/* CPU clock in Mhz or 100ths of a percent. */
+	int	freq;	/* CPU clock in MHz or 100ths of a percent. */
 	int	volts;	/* Voltage in mV. */
 	int	power;	/* Power consumed in mW. */
 	int	lat;	/* Transition latency in us. */
diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4
index 7efc99ee1219..f6ce47c85b99 100644
--- a/share/man/man4/vge.4
+++ b/share/man/man4/vge.4
@@ -58,7 +58,7 @@ driver provides support for various NICs and embedded Ethernet interfaces
 based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity
 Family Gigabit Ethernet controller chips.
 .Pp
-The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed
+The VT6120/VT6122 is a 33/66MHz 64-bit PCI device which combines a tri-speed
 MAC with an integrated 10/100/1000 copper PHY.
 (Some older cards use an external PHY.)
 The VT6130/VT6132 is the PCI express version of Velocity family.
diff --git a/sys/amd64/amd64/local_apic.c b/sys/amd64/amd64/local_apic.c
index 87bec91b6c4f..98ed4df8307d 100644
--- a/sys/amd64/amd64/local_apic.c
+++ b/sys/amd64/amd64/local_apic.c
@@ -448,7 +448,7 @@ lapic_setup_clock(void)
 		panic("lapic: Divisor too big");
 	value /= 2;
 	if (bootverbose)
-		printf("lapic: Divisor %lu, Frequency %lu hz\n",
+		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
 		    lapic_timer_divisor, value);
 
 	/*
diff --git a/sys/dev/aic7xxx/aic79xx_pci.c b/sys/dev/aic7xxx/aic79xx_pci.c
index 928012e0475d..1e3bbed392f1 100644
--- a/sys/dev/aic7xxx/aic79xx_pci.c
+++ b/sys/dev/aic7xxx/aic79xx_pci.c
@@ -248,10 +248,10 @@ static const char *pci_bus_modes[] =
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
 	"PCI bus mode unknown",
-	"PCI-X 101-133Mhz",
-	"PCI-X 67-100Mhz",
-	"PCI-X 50-66Mhz",
-	"PCI 33 or 66Mhz"
+	"PCI-X 101-133MHz",
+	"PCI-X 67-100MHz",
+	"PCI-X 50-66MHz",
+	"PCI 33 or 66MHz"
 };
 
 #define		TESTMODE	0x00000800ul
diff --git a/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c b/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
index dd35e2b7bf0e..43e97ede3bb5 100644
--- a/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
+++ b/sys/dev/ath/ath_hal/ar5210/ar5210_reset.c
@@ -87,7 +87,7 @@ ar5210Reset(struct ath_hal *ah, HAL_OPMODE opmode,
 
 	if (!IEEE80211_IS_CHAN_5GHZ(chan)) {
 		/* Only 11a mode */
-		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5Ghz\n", __func__);
+		HALDEBUG(ah, HAL_DEBUG_ANY, "%s: channel not 5GHz\n", __func__);
 		FAIL(HAL_EINVAL);
 	}
 	/*
diff --git a/sys/dev/ath/if_ath.c b/sys/dev/ath/if_ath.c
index 27912def8e6c..ed69a7d2997a 100644
--- a/sys/dev/ath/if_ath.c
+++ b/sys/dev/ath/if_ath.c
@@ -5351,7 +5351,7 @@ ath_chan_set(struct ath_softc *sc, struct ieee80211_channel *chan)
 		ath_stoprecv(sc);		/* turn off frame recv */
 		if (!ath_hal_reset(ah, sc->sc_opmode, chan, AH_TRUE, &status)) {
 			if_printf(ifp, "%s: unable to reset "
-			    "channel %u (%u Mhz, flags 0x%x), hal status %u\n",
+			    "channel %u (%u MHz, flags 0x%x), hal status %u\n",
 			    __func__, ieee80211_chan2ieee(ic, chan),
 			    chan->ic_freq, chan->ic_flags, status);
 			return EIO;
diff --git a/sys/dev/ct/ct_isa.c b/sys/dev/ct/ct_isa.c
index a1e30457b189..693572fe1c69 100644
--- a/sys/dev/ct/ct_isa.c
+++ b/sys/dev/ct/ct_isa.c
@@ -316,7 +316,7 @@ ct_isa_attach(device_t dev)
 		break;
 	}
 #if	0
-	printf("%s: chiprev %s chipclk %d Mhz\n", 
+	printf("%s: chiprev %s chipclk %d MHz\n", 
 		slp->sl_dev.dv_xname, s, ct->sc_chipclk);
 #endif
 
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index b26c90a7bf6f..189f53991c96 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -2528,7 +2528,7 @@ mly_describe_controller(struct mly_softc *sc)
 		   mly_describe_code(mly_table_memorytype, mi->memory_type),
 		   mi->memory_parity ? "+parity": "",mi->memory_ecc ? "+ECC": "",
 		   mi->cache_size);
-	mly_printf(sc, "CPU: %s @ %dMHZ\n", 
+	mly_printf(sc, "CPU: %s @ %dMHz\n", 
 		   mly_describe_code(mly_table_cputype, mi->cpu[0].type), mi->cpu[0].speed);
 	if (mi->l2cache_size != 0)
 	    mly_printf(sc, "%dKB L2 cache\n", mi->l2cache_size);
diff --git a/sys/i386/i386/local_apic.c b/sys/i386/i386/local_apic.c
index 9b1d1b3173e0..1451ec808e30 100644
--- a/sys/i386/i386/local_apic.c
+++ b/sys/i386/i386/local_apic.c
@@ -450,7 +450,7 @@ lapic_setup_clock(void)
 		panic("lapic: Divisor too big");
 	value /= 2;
 	if (bootverbose)
-		printf("lapic: Divisor %lu, Frequency %lu hz\n",
+		printf("lapic: Divisor %lu, Frequency %lu Hz\n",
 		    lapic_timer_divisor, value);
 
 	/*
diff --git a/tools/tools/ath/athdecode/main.c b/tools/tools/ath/athdecode/main.c
index e27c4e49bb77..977ae1400f46 100644
--- a/tools/tools/ath/athdecode/main.c
+++ b/tools/tools/ath/athdecode/main.c
@@ -125,13 +125,13 @@ opmark(FILE *fd, int i, const struct athregrec *r)
 			fprintf(fd, "ar%uReset (done), OK", state.chipnum);
 		break;
 	case AH_MARK_CHIPRESET:
-		fprintf(fd, "ar%uChipReset, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uChipReset, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_PERCAL:
-		fprintf(fd, "ar%uPerCalibration, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uPerCalibration, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_SETCHANNEL:
-		fprintf(fd, "ar%uSetChannel, channel %u Mhz", state.chipnum, r->val);
+		fprintf(fd, "ar%uSetChannel, channel %u MHz", state.chipnum, r->val);
 		break;
 	case AH_MARK_ANI_RESET:
 		switch (r->val) {