UNITED STATES
               SECURITIES AND EXCHANGE COMMISSION
                     Washington, D.C.  20549

                          FORM 10-QSB/A2

           Quarterly Report Under Section 13 or 15(d)
             of The Securities Exchange Act of 1934

             For the Quarter Ended:  March 31, 2007

               Commission file number:  000-29274


           AEI INCOME & GROWTH FUND XXI LIMITED PARTNERSHIP
(Exact Name of Small Business Issuer as Specified in its Charter)


      State of Minnesota                   41-1789725
(State or other Jurisdiction of         (I.R.S. Employer
Incorporation or Organization)        Identification No.)


    30 East 7th Street, Suite 1300, St. Paul, Minnesota 55101
             (Address of Principal Executive Offices)

                          (651) 227-7333
                   (Issuer's telephone number)


                        Not  Applicable
 (Former name, former address and former fiscal year, if changed
                       since last report)

Check  whether  the issuer (1) filed all reports required  to  be
filed by Section 13 or 15(d) of the Exchange Act during the  past
12  months  (or  for such shorter period that the registrant  was
required to file such reports), and (2) has been subject to  such
filing requirements for the past 90 days.       Yes [X]   No

Indicate by check mark whether the registrant is a shell  company
(as defined in Rule 12b-2 of the Exchange Act). Yes       No [X]

Transitional Small Business Disclosure Format:  Yes       No [X]


ITEM 3. CONTROLS AND PROCEDURES.

       (a) Evaluation of disclosure controls and procedures

        Under  the  supervision  and with  the  participation  of
management, including its President and Chief Financial  Officer,
the  Managing  General Partner of the Partnership  evaluated  the
effectiveness  of  the  design and operation  of  its  disclosure
controls  and procedures (as defined in Rule 13a-14(c) under  the
Exchange  Act).   Based upon that evaluation, the  President  and
Chief Financial Officer of the Managing General Partner concluded
that,  as  of  the end of the period covered by this report,  the
disclosure  controls  and  procedures  of  the  Partnership  were
effective  in ensuring that information required to be  disclosed
by  us in the reports we file or submit under the Exchange Act is
recorded,  processed, summarized and reported,  within  the  time
periods  specified in applicable rules and forms  and  that  such
information   is  accumulated  and  communicated  to  management,
including  the  President  and Chief  Financial  Officer  of  the
Managing  General  Partner,  in  a  manner  that  allows   timely
decisions regarding required disclosure.

       (b)  Changes in internal controls

         There   were   no  significant  changes  made   in   the
Partnership's  internal controls during the  most  recent  period
covered  by  this  report that have materially affected,  or  are
reasonably   likely  to  materially  affect,  the   Partnership's
internal control over financial reporting.



                           SIGNATURES

        In  accordance with the requirements of the Exchange Act,
the  registrant caused this report to be signed on its behalf  by
the undersigned, thereunto duly authorized.


Dated:  January 7, 2008       AEI Income & Growth Fund XXI
                              Limited Partnership
                              By:  AEI Fund Management XXI, Inc.
                              Its: Managing General Partner



                              By: /s/ Robert P Johnson
                                      Robert P. Johnson
                                      President
                                      (Principal Executive Officer)



                              By: /s/ Patrick W Keene
                                      Patrick W. Keene
                                      Chief Financial Officer
                                      (Principal Accounting Officer)