diff -ru adium-1.3.8/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m adium-1.3.8-patched/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m
--- adium-1.3.8/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m	2009-11-05 03:51:28.000000000 +0100
+++ adium-1.3.8-patched/Frameworks/AIUtilities Framework/Source/AIBorderlessWindow.m	2009-11-05 10:40:51.000000000 +0100
@@ -111,7 +111,7 @@
 		newWindowFrame.origin = newOrigin;
 
 		//If the user is not pressing shift, attempt to dock this window the the visible frame first, and then to the screen frame
-		if (![theEvent shiftKey]) {
+		if (NO && ![theEvent shiftKey]) {
 			[self dockWindowFrame:&newWindowFrame toScreenFrame:[currentScreen visibleFrame]];
 			[self dockWindowFrame:&newWindowFrame toScreenFrame:[currentScreen frame]];
 		}
diff -ru adium-1.3.8/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m adium-1.3.8-patched/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m
--- adium-1.3.8/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m	2009-11-05 03:51:28.000000000 +0100
+++ adium-1.3.8-patched/Frameworks/AIUtilities Framework/Source/AIDockingWindow.m	2009-11-05 10:40:51.000000000 +0100
@@ -59,7 +59,7 @@
 	resisted_YMotion = 0;
 	oldWindowFrame = NSMakeRect(0,0,0,0);
 	alreadyMoving = NO;
-	dockingEnabled = YES;
+	dockingEnabled = NO;
 }
 
 //Stop observing movement
diff -ru adium-1.3.8/Release/Makefile adium-1.3.8-patched/Release/Makefile
--- adium-1.3.8/Release/Makefile	2009-11-05 03:51:28.000000000 +0100
+++ adium-1.3.8-patched/Release/Makefile	2009-11-05 11:13:08.000000000 +0100
@@ -20,7 +20,7 @@
 VERSION=1.3.8
 BUILD_IN_DEBUG_MODE?=FALSE
 BETA?=FALSE
-OFFICIAL_BUILD?=TRUE
+OFFICIAL_BUILD?=FALSE
 
 # Always builds in debug mode.
 NIGHTLY?=FALSE
@@ -89,7 +89,7 @@
 ###########
 .PHONY: all all-withlocalchanges all-withlocalchanges-noclean all-nopackage-noclean all-nightly update assertnochanges assertnoconflicts version compile clean release source prepare-release-bundle createfolder diskimage nightly tarball
 
-all: update assertnochanges version clean compile release
+all: version clean compile release
 all-withlocalchanges: update assertnoconflicts version clean compile release
 all-withlocalchanges-noclean: update assertnoconflicts version compile release
 
@@ -170,21 +170,21 @@
 	./mkalias -r /Applications $(ADIUM_DIR)/Applications
 
 diskimage:
-	rm "$(BUILD_DIR)/$(RELEASE_NAME).dmg" || true
+	rm "$(BUILD_DIR)/$(RELEASE_NAME)-NDW.dmg" || true
 	@# make Adium disk image
 	mkdir -p $(ADIUM_DIR)/.background
 	cp $(ART_DIR)/dmgBackground.png $(ADIUM_DIR)/.background
 
 	./ensureCustomIconsExtracted $(ART_DIR)
-	./make-diskimage.sh $(BUILD_DIR)/$(RELEASE_NAME).dmg $(ADIUM_DIR) "Adium $(VERSION)" dmg_adium.scpt $(ART_DIR)
+	./make-diskimage.sh $(BUILD_DIR)/$(RELEASE_NAME)-NDW.dmg $(ADIUM_DIR) "Adium $(VERSION)" dmg_adium.scpt $(ART_DIR)
 	
-	@echo Build finished. `md5 $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED).dmg`
+	@echo Build finished. `md5 $(BUILD_DIR)/$(RELEASE_NAME_ESCAPED)-NDW.dmg`
 
 #This is what nightly builds use. Does not update because buildbot does.
 nightly: assertnochanges version clean compile release
 	echo $(RELEASE_NAME) > $(BUILD_DIR)/latest
 	(svn info | perl -nle 's/Revision: ([0-9]+)/$$1/g and print "r".$$_') >> $(BUILD_DIR)/latest
-	md5 -q $(BUILD_DIR)/$(RELEASE_NAME).dmg > $(BUILD_DIR)/$(RELEASE_NAME).dmg.md5sum
+	md5 -q $(BUILD_DIR)/$(RELEASE_NAME)-NDW.dmg > $(BUILD_DIR)/$(RELEASE_NAME)-NDW.dmg.md5sum
 
 tarball:
 	hg archive -t tgz ($TARBALL_DIR).tgz