diff --git a/.release b/.release
index 51faac07be14ca7c1987d83d647ec9ae96fec0fe..f979421c6a2aea8e48d5cf01c995fa8598a67650 100644
--- a/.release
+++ b/.release
@@ -1,2 +1,2 @@
-release=0.6.4
-tag=lmcbaseclasses-0.6.4
+release=0.6.5
+tag=lmcbaseclasses-0.6.5
diff --git a/README.md b/README.md
index a416cd460894b21d9d1ffa861b858ad64a7916cb..8d7a79a62e680bf2684f80a25ea521b8576e42df 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,10 @@ The lmc-base-classe repository contains set of eight classes as mentioned in SKA
 
 ## Version History
 
+#### 0.6.5
+- Fix to observation state machine: allow Abort() from RESETTING observation
+  state
+
 #### 0.6.4
 - Refactor state machine to use pytransitions library.
 - Minor behavioural change: Off() command is accepted in every obsState, rather
diff --git a/docs/source/images/BaseDeviceStateMachine.png b/docs/source/images/BaseDeviceStateMachine.png
index ca141bc982bdeededdcb9953e14c20c5b582292b..805ed112bc4811383278bea4d00c88768580c7c1 100644
Binary files a/docs/source/images/BaseDeviceStateMachine.png and b/docs/source/images/BaseDeviceStateMachine.png differ
diff --git a/docs/source/images/ObservationStateMachine.png b/docs/source/images/ObservationStateMachine.png
index 112c60101272b7c5e33f7f2071af25340fa6d576..8a06b18e1a03ac15f1664557b64f49c0f5a6fa65 100644
Binary files a/docs/source/images/ObservationStateMachine.png and b/docs/source/images/ObservationStateMachine.png differ
diff --git a/src/ska/base/release.py b/src/ska/base/release.py
index 22e3240fb99e973a8ee33e49ae2fa2b3df5249cb..e62b34d25817a862a36c455b2f7bfc74e4d39952 100644
--- a/src/ska/base/release.py
+++ b/src/ska/base/release.py
@@ -7,7 +7,7 @@
 """Release information for lmc-base-classes Python Package"""
 
 name = """lmcbaseclasses"""
-version = "0.6.4"
+version = "0.6.5"
 version_info = version.split(".")
 description = """A set of generic base devices for SKA Telescope."""
 author = "SKA India and SARAO and CSIRO"
diff --git a/src/ska/base/state_machine.py b/src/ska/base/state_machine.py
index 044a97df199f88fd176b370b1e31192801d847d7..8ecbfa56912a4284c7bc686bba802d4860642458 100644
--- a/src/ska/base/state_machine.py
+++ b/src/ska/base/state_machine.py
@@ -404,6 +404,7 @@ class ObservationStateMachine(Machine):
                 "source": [
                     ObsState.IDLE.name, ObsState.CONFIGURING.name,
                     ObsState.READY.name, ObsState.SCANNING.name,
+                    ObsState.RESETTING.name,
                 ],
                 "trigger": "abort_started",
                 "dest": ObsState.ABORTING.name,
diff --git a/tests/data/observation_state_machine.json b/tests/data/observation_state_machine.json
index 4165bae0b69ed7e85936e133b050d3b79f93b8ad..8aa6c51d39dc432157a142cba0b1191b645064b4 100644
--- a/tests/data/observation_state_machine.json
+++ b/tests/data/observation_state_machine.json
@@ -189,6 +189,11 @@
         "obs_reset_failed",
         "FAULT"
     ],
+    [
+        "RESETTING",
+        "abort_started",
+        "ABORTING"
+    ],
     [
         "RESETTING",
         "fatal_error",
diff --git a/tests/data/subarray_state_machine.json b/tests/data/subarray_state_machine.json
index 2c416dcd8dbb6a5732952f7ba2fc38e9fa51a3fd..807358c8280494602ba7c2d28ccd17c90de2f1f6 100644
--- a/tests/data/subarray_state_machine.json
+++ b/tests/data/subarray_state_machine.json
@@ -494,6 +494,11 @@
         "obs_reset_failed",
         "FAULT"
     ],
+    [
+        "RESETTING",
+        "abort_started",
+        "ABORTING"
+    ],
     [
         "RESETTING",
         "fatal_error",