diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 806a156005..9ebfa4f277 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,9 @@
+November 19, 2007 (Changes by Graf Zahl)
+- Changed first name from 'none' to ''. The internal constant is still NAME_None,
+  though.
+- Fixed: Picking up a backpack incorrectly set the maximum amount for any ammo
+  type that didn't have a BackpackMaxAmount to 0.
+
 November 18, 2007 (Changes by Graf Zahl)
 - Fixed TableShit0 definition.
 
diff --git a/src/g_shared/a_pickups.cpp b/src/g_shared/a_pickups.cpp
index 625fb1dd55..a4f92a0510 100644
--- a/src/g_shared/a_pickups.cpp
+++ b/src/g_shared/a_pickups.cpp
@@ -1511,7 +1511,7 @@ AInventory *ABackpackItem::CreateCopy (AActor *other)
 			{ // The player did not have the ammo. Add it.
 				ammo = static_cast<AAmmo *>(Spawn (type, 0, 0, 0, NO_REPLACE));
 				ammo->Amount = bDepleted ? 0 : amount;
-				ammo->MaxAmount = ammo->BackpackMaxAmount;
+				if (ammo->BackpackMaxAmount > ammo->MaxAmount) ammo->MaxAmount = ammo->BackpackMaxAmount;
 				ammo->AttachToOwner (other);
 			}
 			else
diff --git a/src/name.cpp b/src/name.cpp
index b8a7d123e9..f9e111742d 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -71,8 +71,10 @@ FName::NameManager FName::NameData;
 static const char *PredefinedNames[] =
 {
 #define xx(n) #n,
+#define yy(n,s) s,
 #include "namedef.h"
 #undef xx
+#undef yy
 };
 
 // CODE --------------------------------------------------------------------
diff --git a/src/name.h b/src/name.h
index fa161ab2e8..01cc15409d 100644
--- a/src/name.h
+++ b/src/name.h
@@ -37,8 +37,10 @@
 enum ENamedName
 {
 #define xx(n) NAME_##n,
+#define yy(n,s) NAME_##n,
 #include "namedef.h"
 #undef xx
+#undef yy
 };
 
 class FString;
diff --git a/src/namedef.h b/src/namedef.h
index 77ce6bafed..79b5a18e19 100644
--- a/src/namedef.h
+++ b/src/namedef.h
@@ -1,5 +1,5 @@
 // 'None' must always be the first name.
-xx(None)
+yy(None, "")
 
 xx(Super)
 xx(Object)