diff --git a/btm/src/main/java/bitronix/tm/BitronixTransactionManager.java b/btm/src/main/java/bitronix/tm/BitronixTransactionManager.java
index 24114e4d..36cdd218 100644
--- a/btm/src/main/java/bitronix/tm/BitronixTransactionManager.java
+++ b/btm/src/main/java/bitronix/tm/BitronixTransactionManager.java
@@ -370,12 +370,37 @@ private void internalShutdown() {
         if (txCount > 0) {
             if (log.isDebugEnabled()) log.debug("still " + txCount + " in-flight transactions, shutting down anyway");
             dumpTransactionContexts();
+            rollbackAllInFlightTransactions();
         }
         else {
             if (log.isDebugEnabled()) log.debug("all transactions finished, resuming shutdown");
         }
     }
 
+    /**
+     * Rollback all inflight transactions when shutting down to inform all resource holders (specially XA ones)
+     * nothing more will happen here.
+     * This avoids indoubt threads like
+     * <pre>
+     *  V466-THREAD HAS BEEN INDOUBT FOR 27:25:58
+     *  V451-RESYNC WITH COORDINATOR STILL PENDING
+     * </pre>
+     */
+	private void rollbackAllInFlightTransactions() {
+		log.warn("Rollback all remaining "+inFlightTransactions.size()+" inFlightTransactions");
+        for (Map.Entry<Uid, BitronixTransaction> entry : inFlightTransactions.entrySet()) {
+            BitronixTransaction tx = entry.getValue();
+            try {
+        		log.warn("Rollback Uid="+entry.getKey()+" inFlightTransaction="+tx.toString());
+        		tx.rollback();
+            } catch (SystemException e) {
+        		log.warn("Ignore Exception when rolling back during shutdown Uid="+entry.getKey()+" inFlightTransaction="+tx.toString());
+			}
+        }
+		log.info("Rollback of remaining inFlightTransactions finished.");
+		inFlightTransactions.clear();
+	}
+
     public String toString() {
         return "a BitronixTransactionManager with " + inFlightTransactions.size() + " in-flight transaction(s)";
     }