diff --git a/js/bootstrap-affix_prototype.js b/js/bootstrap-affix_prototype.js
index a41d32f6cac4..76ceaa1613e0 100644
--- a/js/bootstrap-affix_prototype.js
+++ b/js/bootstrap-affix_prototype.js
@@ -62,7 +62,7 @@ BootStrap.Affix = Class.create({
 		, offset = this.options.offset
 		, offsetBottom = offset.bottom
 		, offsetTop = offset.top
-		, reset = 'affix affix-top affix-bottom'
+		, reset = ['affix','affix-top','affix-bottom']
 		, affix
 
 		if (typeof offset != 'object') offsetBottom = offsetTop = offset
@@ -79,7 +79,8 @@ BootStrap.Affix = Class.create({
 		this.affixed = affix
 		this.unpin = affix == 'bottom' ? position.top - scrollTop : null
 
-		this.$element.removeClassName(reset).addClassName('affix' + (affix ? '-' + affix : ''))
+		$(reset).each(function(a){Element.removeClassName(this.$element,a)},this)
+		this.$element.addClassName('affix' + (affix ? '-' + affix : ''))
 	}
 });
 
@@ -92,4 +93,4 @@ Event.observe(window,'load',function(){
 
 		new BootStrap.Affix($spy,data);
 	})
-})
\ No newline at end of file
+})
diff --git a/js/bootstrap-scrollspy_prototype.js b/js/bootstrap-scrollspy_prototype.js
index 5aef3e3df059..cfb748e56031 100644
--- a/js/bootstrap-scrollspy_prototype.js
+++ b/js/bootstrap-scrollspy_prototype.js
@@ -50,7 +50,7 @@ BootStrap.ScrollSpy = Class.create({
 		var href
 
 		Object.extend(this.options, options)
-		this.$scrollElement = $element.observe('scroll', this.process.bind(this))
+		this.$scrollElement = Event.observe($element,'scroll', this.process.bind(this))
 		this.selector = (this.options.target
 			|| ((href = element.readAttribute('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
 			|| '') + ' .nav li > a'
@@ -70,18 +70,18 @@ BootStrap.ScrollSpy = Class.create({
 			var href = $el.readAttribute('data-target') || $el.readAttribute('href')
 			var $href = /^#\w/.test(href) && $$(href).first()
 			return ( $href
-				&& [ $href.viewportOffset().top - $href.getHeight() + ((this.$scrollElement != window) && this.$scrollElement.cumulativeScrollOffset().top), href ] ) || null
+				&& [ $href.cumulativeOffset().top + ((this.$scrollElement != window) && this.$scrollElement.cumulativeScrollOffset().top), href ] ) || null
 		},this).without(false,null)
-		.sort(function (a, b) { return a - b })
+		.sort(function (a, b) { return a[0] - b[0] })
 		.each(function(v){
 			this.offsets.push(v[0])
 			this.targets.push(v[1])
 		},this)
 	},
 	process: function () {
-		var scrollTop = this.$scrollElement.cumulativeScrollOffset().top + this.options.offset
+		var scrollTop = (this.$scrollElement===window?document.viewport.getScrollOffsets().top:this.$scrollElement.cumulativeScrollOffset().top) + this.options.offset
 		var scrollHeight = this.$scrollElement.scrollHeight || this.$body.scrollHeight
-		var maxScroll = scrollHeight - this.$scrollElement.getHeight()
+		var maxScroll = scrollHeight - (this.$scrollElement===window?document.viewport.getHeight():this.$scrollElement.getHeight())
 		var offsets = this.offsets
 		var targets = this.targets
 		var activeTarget = this.activeTarget
@@ -126,4 +126,5 @@ Event.observe(window,'load', function () {
 	$$('[data-spy="scroll"]').each(function(element) {
 		new BootStrap.ScrollSpy(element)
 	})
-})
\ No newline at end of file
+})
+