diff --git a/pkg/apis/extensions/v1beta1/conversion.go b/pkg/apis/extensions/v1beta1/conversion.go
index 595091e027c..198ed3f4c67 100644
--- a/pkg/apis/extensions/v1beta1/conversion.go
+++ b/pkg/apis/extensions/v1beta1/conversion.go
@@ -42,6 +42,8 @@ func addConversionFuncs(scheme *runtime.Scheme) {
 		Convert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment,
 		Convert_extensions_ReplicaSetSpec_To_v1beta1_ReplicaSetSpec,
 		Convert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec,
+		Convert_extensions_JobSpec_To_v1beta1_JobSpec,
+		Convert_v1beta1_JobSpec_To_extensions_JobSpec,
 	)
 	if err != nil {
 		// If one of the conversion functions is malformed, detect it immediately.
@@ -277,3 +279,107 @@ func Convert_v1beta1_ReplicaSetSpec_To_extensions_ReplicaSetSpec(in *ReplicaSetS
 	}
 	return nil
 }
+
+func Convert_extensions_JobSpec_To_v1beta1_JobSpec(in *extensions.JobSpec, out *JobSpec, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*extensions.JobSpec))(in)
+	}
+	if in.Parallelism != nil {
+		out.Parallelism = new(int32)
+		*out.Parallelism = int32(*in.Parallelism)
+	} else {
+		out.Parallelism = nil
+	}
+	if in.Completions != nil {
+		out.Completions = new(int32)
+		*out.Completions = int32(*in.Completions)
+	} else {
+		out.Completions = nil
+	}
+	if in.ActiveDeadlineSeconds != nil {
+		out.ActiveDeadlineSeconds = new(int64)
+		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
+	} else {
+		out.ActiveDeadlineSeconds = nil
+	}
+	// unable to generate simple pointer conversion for unversioned.LabelSelector -> v1beta1.LabelSelector
+	if in.Selector != nil {
+		out.Selector = new(LabelSelector)
+		if err := Convert_unversioned_LabelSelector_To_v1beta1_LabelSelector(in.Selector, out.Selector, s); err != nil {
+			return err
+		}
+	} else {
+		out.Selector = nil
+	}
+
+	// BEGIN non-standard conversion
+	// autoSelector has opposite meaning as manualSelector.
+	// in both cases, unset means false, and unset is always preferred to false.
+	// unset vs set-false distinction is not preserved.
+	manualSelector := in.ManualSelector != nil && *in.ManualSelector
+	autoSelector := !manualSelector
+	if autoSelector {
+		out.AutoSelector = new(bool)
+		*out.AutoSelector = true
+	} else {
+		out.AutoSelector = nil
+	}
+	// END non-standard conversion
+
+	if err := Convert_api_PodTemplateSpec_To_v1_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+func Convert_v1beta1_JobSpec_To_extensions_JobSpec(in *JobSpec, out *extensions.JobSpec, s conversion.Scope) error {
+	if defaulting, found := s.DefaultingInterface(reflect.TypeOf(*in)); found {
+		defaulting.(func(*JobSpec))(in)
+	}
+	if in.Parallelism != nil {
+		out.Parallelism = new(int)
+		*out.Parallelism = int(*in.Parallelism)
+	} else {
+		out.Parallelism = nil
+	}
+	if in.Completions != nil {
+		out.Completions = new(int)
+		*out.Completions = int(*in.Completions)
+	} else {
+		out.Completions = nil
+	}
+	if in.ActiveDeadlineSeconds != nil {
+		out.ActiveDeadlineSeconds = new(int64)
+		*out.ActiveDeadlineSeconds = *in.ActiveDeadlineSeconds
+	} else {
+		out.ActiveDeadlineSeconds = nil
+	}
+	// unable to generate simple pointer conversion for v1beta1.LabelSelector -> unversioned.LabelSelector
+	if in.Selector != nil {
+		out.Selector = new(unversioned.LabelSelector)
+		if err := Convert_v1beta1_LabelSelector_To_unversioned_LabelSelector(in.Selector, out.Selector, s); err != nil {
+			return err
+		}
+	} else {
+		out.Selector = nil
+	}
+
+	// BEGIN non-standard conversion
+	// autoSelector has opposite meaning as manualSelector.
+	// in both cases, unset means false, and unset is always preferred to false.
+	// unset vs set-false distinction is not preserved.
+	autoSelector := bool(in.AutoSelector != nil && *in.AutoSelector)
+	manualSelector := !autoSelector
+	if manualSelector {
+		out.ManualSelector = new(bool)
+		*out.ManualSelector = true
+	} else {
+		out.ManualSelector = nil
+	}
+	// END non-standard conversion
+
+	if err := Convert_v1_PodTemplateSpec_To_api_PodTemplateSpec(&in.Template, &out.Template, s); err != nil {
+		return err
+	}
+	return nil
+}
diff --git a/pkg/apis/extensions/v1beta1/conversion_test.go b/pkg/apis/extensions/v1beta1/conversion_test.go
new file mode 100644
index 00000000000..a0e43dfbca8
--- /dev/null
+++ b/pkg/apis/extensions/v1beta1/conversion_test.go
@@ -0,0 +1,83 @@
+/*
+Copyright 2016 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1beta1_test
+
+import (
+	"reflect"
+	"testing"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/apis/extensions"
+	versioned "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
+)
+
+// TestJobSpecConversion tests that ManualSelector and AutoSelector
+// are handled correctly.
+func TestJobSpecConversion(t *testing.T) {
+	pTrue := new(bool)
+	*pTrue = true
+	pFalse := new(bool)
+	*pFalse = false
+
+	// False or nil convert to true.
+	// True converts to nil.
+	tests := []struct {
+		in        *bool
+		expectOut *bool
+	}{
+		{
+			in:        nil,
+			expectOut: pTrue,
+		},
+		{
+			in:        pFalse,
+			expectOut: pTrue,
+		},
+		{
+			in:        pTrue,
+			expectOut: nil,
+		},
+	}
+
+	// Test internal -> v1beta1.
+	for _, test := range tests {
+		i := &extensions.JobSpec{
+			ManualSelector: test.in,
+		}
+		v := versioned.JobSpec{}
+		if err := api.Scheme.Convert(i, &v); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !reflect.DeepEqual(test.expectOut, v.AutoSelector) {
+			t.Fatalf("want v1beta1.AutoSelector %v, got %v", test.expectOut, v.AutoSelector)
+		}
+	}
+
+	// Test v1beta1 -> internal.
+	for _, test := range tests {
+		i := &versioned.JobSpec{
+			AutoSelector: test.in,
+		}
+		e := extensions.JobSpec{}
+		if err := api.Scheme.Convert(i, &e); err != nil {
+			t.Fatalf("unexpected error: %v", err)
+		}
+		if !reflect.DeepEqual(test.expectOut, e.ManualSelector) {
+			t.Fatalf("want extensions.ManualSelector %v, got %v", test.expectOut, e.ManualSelector)
+		}
+	}
+}