diff --git a/forms/DatetimeField.php b/forms/DatetimeField.php
index 6581208ba..4de0bf606 100644
--- a/forms/DatetimeField.php
+++ b/forms/DatetimeField.php
@@ -215,6 +215,24 @@ class DatetimeField extends FormField {
 	public function getDateField() {
 		return $this->dateField;
 	}
+
+	/**
+	 * @param FormField
+	 */
+	public function setDateField($field) {
+		$expected = $this->getName() . '[date]';
+		if($field->getName() != $expected) {
+			throw new InvalidArgumentException(sprintf(
+				'Wrong name format for date field: "%s" (expected "%s")',
+				$field->getName(),
+				$expected
+			));
+		}
+
+		$field->setForm($this->getForm());
+		$this->dateField = $field;
+		$this->setValue($this->value); // update value
+	}
 	
 	/**
 	 * @return TimeField
@@ -222,6 +240,24 @@ class DatetimeField extends FormField {
 	public function getTimeField() {
 		return $this->timeField;
 	}
+
+	/**
+	 * @param FormField
+	 */
+	public function setTimeField($field) {
+		$expected = $this->getName() . '[time]';
+		if($field->getName() != $expected) {
+			throw new InvalidArgumentException(sprintf(
+				'Wrong name format for time field: "%s" (expected "%s")',
+				$field->getName(),
+				$expected
+			));
+		}
+
+		$field->setForm($this->getForm());
+		$this->timeField = $field;
+		$this->setValue($this->value); // update value
+	}
 	
 	/**
 	 * @return FormField
diff --git a/tests/forms/DatetimeFieldTest.php b/tests/forms/DatetimeFieldTest.php
index 932cd1f88..dc899d0b6 100644
--- a/tests/forms/DatetimeFieldTest.php
+++ b/tests/forms/DatetimeFieldTest.php
@@ -25,16 +25,9 @@ class DatetimeFieldTest extends SapphireTest {
 	}
 
 	public function testFormSaveInto() {
-		$form = new Form(
-			new Controller(), 
-			'Form',
-			new FieldList(
-				$f = new DatetimeField('MyDatetime', null)
-			),
-			new FieldList(
-				new FormAction('doSubmit')
-			)
-		);
+		$f = new DatetimeField('MyDatetime', null);
+		$form = $this->getMockForm();
+		$form->Fields()->push($f);
 		$f->setValue(array(
 			'date' => '29/03/2003',
 			'time' => '23:59:38'
@@ -170,6 +163,65 @@ class DatetimeFieldTest extends SapphireTest {
 		
 		date_default_timezone_set($oldTz);
 	}
+
+	public function testSetDateField() {
+		$form = $this->getMockForm();
+		$field = new DatetimeField('Datetime', 'Datetime');
+		$field->setForm($form);
+		$field->setValue(array(
+			'date' => '24/06/2003', 
+			'time' => '23:59:59',
+		));
+		$dateField = new DateField('Datetime[date]');
+		$field->setDateField($dateField);
+
+		$this->assertEquals(
+			$dateField->getForm(),
+			$form,
+			'Sets form on new field'
+		);
+
+		$this->assertEquals(
+			'2003-06-24',
+			$dateField->dataValue(),
+			'Sets existing value on new field'
+		);
+	}
+
+	public function testSetTimeField() {
+		$form = $this->getMockForm();
+		$field = new DatetimeField('Datetime', 'Datetime');
+		$field->setForm($form);
+		$field->setValue(array(
+			'date' => '24/06/2003', 
+			'time' => '23:59:59',
+		));
+		$timeField = new TimeField('Datetime[time]');
+		$field->setTimeField($timeField);
+
+		$this->assertEquals(
+			$timeField->getForm(),
+			$form,
+			'Sets form on new field'
+		);
+
+		$this->assertEquals(
+			'23:59:59',
+			$timeField->dataValue(),
+			'Sets existing value on new field'
+		);
+	}
+
+	protected function getMockForm() {
+		return new Form(
+			new Controller(), 
+			'Form',
+			new FieldList(),
+			new FieldList(
+				new FormAction('doSubmit')
+			)
+		);
+	}
 }
 
 /**