diff --git a/Gemfile b/Gemfile
index 568e9ef..7c89769 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,6 +42,10 @@ gem 'gitlab', :git => 'git://github.com/NARKOZ/gitlab'
 # Bitbucket Issues
 gem 'bitbucket_rest_api'
 
+# Unfuddle
+gem "taskmapper", "~> 0.8.0"
+gem "taskmapper-unfuddle", "~> 0.7.0"
+
 # Notification services
 # ---------------------------------------
 # Campfire
diff --git a/Gemfile.lock b/Gemfile.lock
index c0f46c1..172f295 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -303,6 +303,13 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    taskmapper (0.8.0)
+      activeresource (~> 3.0)
+      activesupport (~> 3.0)
+      hashie (~> 1.2)
+    taskmapper-unfuddle (0.7.0)
+      addressable (~> 2.2)
+      taskmapper (~> 0.8)
     therubyracer (0.11.4)
       libv8 (~> 3.11.8.12)
       ref
@@ -389,6 +396,8 @@ DEPENDENCIES
   ruby-debug
   ruby-fogbugz
   rushover
+  taskmapper (~> 0.8.0)
+  taskmapper-unfuddle (~> 0.7.0)
   therubyracer
   thin
   timecop
diff --git a/app/models/issue_tracker.rb b/app/models/issue_tracker.rb
index f37f02d..ee25648 100644
--- a/app/models/issue_tracker.rb
+++ b/app/models/issue_tracker.rb
@@ -15,6 +15,7 @@ class IssueTracker
   field :password, :type => String
   field :ticket_properties, :type => String
   field :subdomain, :type => String
+  field :milestone_id, :type => String
 
   validate :check_params
 
@@ -40,4 +41,3 @@ class IssueTracker
     project_id.present?
   end
 end
-
diff --git a/app/models/issue_trackers/unfuddle_tracker.rb b/app/models/issue_trackers/unfuddle_tracker.rb
new file mode 100644
index 0000000..0cbb4f5
--- /dev/null
+++ b/app/models/issue_trackers/unfuddle_tracker.rb
@@ -0,0 +1,69 @@
+class IssueTrackers::UnfuddleTracker < IssueTracker
+  Label = "unfuddle"
+  Fields = [
+
+            [:account, {
+               :placeholder => "Your domain"
+             }],
+
+
+            [:username, {
+               :placeholder => "Your username"
+             }],
+
+            [:password, {
+               :placeholder => "Your password"
+             }],
+
+            [:project_id, {
+               :label       => "Ticket Project",
+               :placeholder => "Project where tickets will be created"
+             }],
+
+            [:milestone_id, {
+               :optional    => true,
+               :label       => "Ticket Milestone",
+               :placeholder => "Milestone where tickets will be created"
+             }]
+
+
+           ]
+
+  def check_params
+    if Fields.detect {|f| self[f[0]].blank? && !f[1][:optional]}
+      errors.add :base, 'You must specify your Account, Username, Password and Project ID'
+    end
+  end
+
+  def create_issue(problem, reported_by = nil)
+    unfuddle = TaskMapper.new(:unfuddle, :username => username, :password => password, :account => account)
+
+    begin
+      issue_options = {:project_id => project_id,
+        :summary => issue_title(problem),
+        :priority => '5',
+        :status => "new",
+        :description => body_template.result(binding),
+        'description-format' => 'textile' }
+
+      issue_options[:milestone_id] = milestone_id if milestone_id.present?
+
+      issue = unfuddle.project(project_id.to_i).ticket!(issue_options)
+      problem.update_attributes(
+                                :issue_link => "https://#{account}.unfuddle.com/projects/#{project_id}/tickets/#{issue['id']}",
+                                :issue_type => Label
+                                )
+    rescue ActiveResource::UnauthorizedAccess
+      raise ActiveResource::UnauthorizedAccess, "Could not authenticate with Unfuddle. Please check your username and password."
+    end
+
+  end
+
+  def body_template
+    @@body_template ||= ERB.new(File.read(Rails.root + "app/views/issue_trackers/textile_body.txt.erb"))
+  end
+
+  def url
+    "https://devmen.unfuddle.com/projects/#{project_id}"
+  end
+end
diff --git a/spec/fabricators/issue_tracker_fabricator.rb b/spec/fabricators/issue_tracker_fabricator.rb
index b51fceb..425087b 100644
--- a/spec/fabricators/issue_tracker_fabricator.rb
+++ b/spec/fabricators/issue_tracker_fabricator.rb
@@ -33,3 +33,8 @@ Fabricator :bitbucket_issues_tracker, :from => :issue_tracker, :class_name => "I
   project_id 'password'
   api_token 'test_username'
 end
+
+Fabricator :unfuddle_issues_tracker, :from => :issue_tracker, :class_name => "IssueTrackers::UnfuddleTracker" do
+  account 'test'
+  project_id 15
+end
diff --git a/spec/models/issue_trackers/unfuddle_issues_tracker_spec.rb b/spec/models/issue_trackers/unfuddle_issues_tracker_spec.rb
new file mode 100644
index 0000000..41edb84
--- /dev/null
+++ b/spec/models/issue_trackers/unfuddle_issues_tracker_spec.rb
@@ -0,0 +1,93 @@
+require 'spec_helper'
+
+describe IssueTrackers::UnfuddleTracker do
+  it "should create an issue on Unfuddle Issues with problem params, and set issue link for problem" do
+    repo = "test_user/test_repo"
+    notice = Fabricate :notice
+    tracker = Fabricate :unfuddle_issues_tracker, :app => notice.app
+    problem = notice.problem
+
+    number = 123
+    @issue_link = "https://test.unfuddle.com/projects/15/tickets/2436"
+
+project_xml = <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <account-id type="integer">1</account-id>
+  <archived type="boolean">false</archived>
+  <assignee-on-resolve>reporter</assignee-on-resolve>
+  <backup-frequency type="integer">0</backup-frequency>
+  <close-ticket-simultaneously-default type="boolean">false</close-ticket-simultaneously-default>
+  <default-ticket-report-id type="integer" nil="true"></default-ticket-report-id>
+  <description nil="true"></description>
+  <disk-usage type="integer">27932</disk-usage>
+  <enable-time-tracking type="boolean">true</enable-time-tracking>
+  <id type="integer">#{tracker.project_id}</id>
+  <s3-access-key-id></s3-access-key-id>
+  <s3-backup-enabled type="boolean">false</s3-backup-enabled>
+  <s3-bucket-name></s3-bucket-name>
+  <short-name>test-project</short-name>
+  <theme>blue</theme>
+  <ticket-field1-active type="boolean">false</ticket-field1-active>
+  <ticket-field1-disposition>text</ticket-field1-disposition>
+  <ticket-field1-title>Field 1</ticket-field1-title>
+  <ticket-field2-active type="boolean">false</ticket-field2-active>
+  <ticket-field2-disposition>text</ticket-field2-disposition>
+  <ticket-field2-title>Field 2</ticket-field2-title>
+  <ticket-field3-active type="boolean">false</ticket-field3-active>
+  <ticket-field3-disposition>text</ticket-field3-disposition>
+  <ticket-field3-title>Field 3</ticket-field3-title>
+  <title>test-project</title>
+  <created-at>2011-04-25T09:21:43Z</created-at>
+  <updated-at>2013-03-08T08:03:02Z</updated-at>
+</project>
+EOF
+
+    ticket_xml =<<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<ticket>
+  <assignee-id type="integer">40</assignee-id>
+  <component-id type="integer" nil="true"></component-id>
+  <description nil="true"></description>
+  <description-format>markdown</description-format>
+  <due-on type="date" nil="true"></due-on>
+  <field1-value-id type="integer" nil="true"></field1-value-id>
+  <field2-value-id type="integer" nil="true"></field2-value-id>
+  <field3-value-id type="integer" nil="true"></field3-value-id>
+  <hours-estimate-current type="float">1268.7</hours-estimate-current>
+  <hours-estimate-initial type="float">0.0</hours-estimate-initial>
+  <id type="integer">2436</id>
+  <milestone-id type="integer">78</milestone-id>
+  <number type="integer">119</number>
+  <priority>3</priority>
+  <project-id type="integer">15</project-id>
+  <reporter-id type="integer">40</reporter-id>
+  <resolution></resolution>
+  <resolution-description></resolution-description>
+  <resolution-description-format>markdown</resolution-description-format>
+  <severity-id type="integer" nil="true"></severity-id>
+  <status>reopened</status>
+  <summary>TEST-ticket.</summary>
+  <version-id type="integer" nil="true"></version-id>
+  <created-at>2012-06-27T17:49:06Z</created-at>
+  <updated-at>2013-03-07T16:04:05Z</updated-at>
+</ticket>
+EOF
+    stub_request(:get, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}.xml").
+      with(:headers => {'Accept'=>'application/xml', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Ruby'}).
+      to_return(:status => 200, :body => project_xml, :headers => {})
+
+
+    stub_request(:post, "https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml").
+      to_return(:status => 200, :body => ticket_xml, :headers => {})
+
+    problem.app.issue_tracker.create_issue(problem)
+    problem.reload
+
+    requested = have_requested(:post,"https://#{tracker.username}:#{tracker.password}@test.unfuddle.com/api/v1/projects/#{tracker.project_id}/tickets.xml" )
+    WebMock.should requested.with(:title => /[production][foo#bar] FooError: Too Much Bar/)
+    WebMock.should requested.with(:content => /See this exception on Errbit/)
+
+    problem.issue_link.should == @issue_link
+  end
+end
--
libgit2 0.21.2