diff --git a/res/values/strings.xml b/res/values/strings.xml
index f481cf48..52372861 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -124,6 +124,8 @@ THE SOFTWARE.
 	<string name="headset_only_summary">Only play music through an external output (e.g. headphones, Bluetooth)</string>
 	<string name="headset_pause_title">Pause When Unplugged</string>
 	<string name="headset_pause_summary">Pause when the headphones are unplugged.</string>
+	<string name="headset_play_title">Play When Plugged</string>
+	<string name="headset_play_summary">Play when the headphones are plugged in. (Only works when the service is running.)</string>
 
 	<string name="pref_notifications">Notifications</string>
 	<string name="notification_mode_title">Notification Mode</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5fc57e36..8ee232f1 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -43,6 +43,11 @@ THE SOFTWARE.
 			android:title="@string/headset_pause_title"
 			android:defaultValue="true"
 			android:summary="@string/headset_pause_summary" />
+		<CheckBoxPreference
+			android:key="headset_play"
+			android:title="@string/headset_play_title"
+			android:summary="@string/headset_play_summary"
+			android:defaultValue="false" />
 	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/pref_notifications">
 		<ListPreference
diff --git a/src/org/kreed/vanilla/PlaybackService.java b/src/org/kreed/vanilla/PlaybackService.java
index 49c12eeb..3db55282 100644
--- a/src/org/kreed/vanilla/PlaybackService.java
+++ b/src/org/kreed/vanilla/PlaybackService.java
@@ -176,6 +176,15 @@ public final class PlaybackService extends Service implements Handler.Callback,
 	 * If true, audio will not be played through the speaker.
 	 */
 	private boolean mHeadsetOnly;
+	/**
+	 * If true, start playing when the headset is plugged in.
+	 */
+	private boolean mHeadsetPlay;
+	/**
+	 * True if the initial broadcast sent when registering HEADSET_PLUG has
+	 * been receieved.
+	 */
+	private boolean mPlugInitialized;
 	/**
 	 * The time to wait before considering the player idle.
 	 */
@@ -240,6 +249,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
 		Song.mDisableCoverArt = settings.getBoolean("disable_cover_art", false);
 		mHeadsetOnly = settings.getBoolean("headset_only", false);
 		mStockBroadcast = settings.getBoolean("stock_broadcast", false);
+		mHeadsetPlay = settings.getBoolean("headset_play", false);
 
 		PowerManager powerManager = (PowerManager)getSystemService(POWER_SERVICE);
 		mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "VanillaMusicLock");
@@ -388,6 +398,8 @@ public final class PlaybackService extends Service implements Handler.Callback,
 				unsetFlag(FLAG_PLAYING);
 		} else if ("stock_broadcast".equals(key)) {
 			mStockBroadcast = settings.getBoolean(key, false);
+		} else if ("headset_play".equals(key)) {
+			mHeadsetPlay = settings.getBoolean(key, false);
 		}
 	}
 
@@ -766,6 +778,11 @@ public final class PlaybackService extends Service implements Handler.Callback,
 			if (AudioManager.ACTION_AUDIO_BECOMING_NOISY.equals(action)) {
 				if (mHeadsetPause)
 					unsetFlag(FLAG_PLAYING);
+			} else if (Intent.ACTION_HEADSET_PLUG.equals(action)) {
+				if (mHeadsetPlay && mPlugInitialized && intent.getIntExtra("state", 0) == 1)
+					setFlag(FLAG_PLAYING);
+				else if (!mPlugInitialized)
+					mPlugInitialized = true;
 			}
 		}
 	};
@@ -830,6 +847,7 @@ public final class PlaybackService extends Service implements Handler.Callback,
 			mReceiver = new Receiver();
 		IntentFilter filter = new IntentFilter();
 		filter.addAction(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+		filter.addAction(Intent.ACTION_HEADSET_PLUG);
 		registerReceiver(mReceiver, filter);
 	}