diff --git a/modules/encoders/x86/countdown.rb b/modules/encoders/x86/countdown.rb
new file mode 100644
index 0000000000..9f72c72872
--- /dev/null
+++ b/modules/encoders/x86/countdown.rb
@@ -0,0 +1,54 @@
+require 'msf/core'
+
+module Msf
+module Encoders
+module X86
+
+class Countdown < Msf::Encoder::Xor
+
+	def initialize
+		super(
+			'Name'             => 'Single-byte xor countdown encoder',
+			'Version'          => '$Revision$',
+			'Description'      => %q{
+				This encoder uses the length of the payload as a position-dependent
+				encoder key to produce a small decoder stub.
+			},
+			'Author'           => 'vlad902',
+			'Arch'             => ARCH_X86,
+			'Decoder'          =>
+				{
+					'BlockSize' => 1,
+				})
+	end
+
+	#
+	# Returns the decoder stub that is adjusted for the size of the buffer
+	# being encoded.
+	#
+	def decoder_stub(state)
+		decoder = 
+			Rex::Arch::X86.set((((state.buf.length - 1) / 4) + 1), 
+				Rex::Arch::X86::ECX,
+				state.badchars) +
+			"\xe8\xff\xff\xff" +
+			"\xff\xc1" +
+			"\x5e" +
+			"\x30\x4c\x0e\x07" +
+			"\xe2\xfa"
+
+		# Initialize the state context to 1
+		state.context = 1
+
+		return decoder
+	end
+
+	def encode_block(state, block)
+		state.context += 1
+		
+		[ block.unpack('C')[0] ^ (state.context - 1) ].pack('C')
+	end
+
+end
+
+end end end